Merge 63102e6 into e91b995

rafspiny · Aug 28, 2018 · a6f5888 · a6f5888
2 parents e91b995 + 63102e6
commit a6f5888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/model/models.py b/model/models.py
@@ -5,11 +5,11 @@ class Profile:
 
     available_keys = ['name', 'isRelative', 'path', 'isDefault']
 
-    def __init__(self, profile_id=-1, name=None, isRelative=False, path=None, isDefault=False):
+    def __init__(self, profile_id=-1, name=None, is_relative=False, path=None, is_default=False):
         self.name = name
-        self.isRelative = isRelative
+        self.isRelative = is_relative
         self.path = path
-        self.isDefault = isDefault
+        self.isDefault = is_default
         self.id = int(profile_id)
         self.__validate_name__()
 

diff --git a/test/test_generator.py b/test/test_generator.py
@@ -148,7 +148,7 @@ def test_add_profile_fails(self, path, profile, expected_message):
             generator.add_profile(profile)
 
     @data(
-        ('/profiles/profiles.ini', [{'profile_id':0}], [{'name':'profile', 'isRelative':True, 'isDefault':False, 'path':'profile.profile', 'profile_id':-1}], """
+        ('/profiles/profiles.ini', [{'profile_id':0}], [{'name':'profile', 'is_relative':True, 'is_default':False, 'path':'profile.profile', 'profile_id':-1}], """
 [General]
 StartWithLastProfile=1