PEP8/PyLint on fields.py

EditorialModel/fields.py

@@ -55,15 +55,15 @@ class EmField(EmComponent):
 
         self.fieldtype = fieldtype
         self._fieldtype_args = kwargs
-        self._fieldtype_args.update({'nullable' : nullable, 'uniq' : uniq, 'internal': self.internal})
+        self._fieldtype_args.update({'nullable': nullable, 'uniq': uniq, 'internal': self.internal})
         try:
             fieldtype_instance = self._fieldtype_cls(**self._fieldtype_args)
         except AttributeError as e:
-            raise AttributeError("Error will instanciating fieldtype : %s"%e)
+            raise AttributeError("Error will instanciating fieldtype : %s" % e)
 
         if 'default' in kwargs:
             if not fieldtype_instance.check(default):
-                raise TypeError("Default value ('%s') is not valid given the fieldtype '%s'"%(default, fieldtype))
+                raise TypeError("Default value ('%s') is not valid given the fieldtype '%s'" % (default, fieldtype))
 
         self.nullable = nullable
         self.uniq = uniq
@@ -76,13 +76,13 @@ class EmField(EmComponent):
     @staticmethod
     ## @brief Return the list of allowed field type
     def fieldtypes_list():
-        return [f for f in EditorialModel.fieldtypes.__all__ if f != '__init__' and f != 'generic' ]
+        return [f for f in EditorialModel.fieldtypes.__all__ if f != '__init__' and f != 'generic']
 
     ##@brief Return the EmFieldgroup this EmField belongs to
     @property
     def _fieldgroup(self):
         return self.model.component(self.fieldgroup_id)
-    
+
     ## @brief Returns the EmClass this EmField belongs to
     @property
     def em_class(self):
@@ -92,7 +92,6 @@ class EmField(EmComponent):
     # @return a fieldtype instance
     def fieldtype_instance(self):
         return self._fieldtype_cls(**self._fieldtype_args)
-        
 
     ## @brief Return the list of relation fields for a rel_to_type
     # @return None if the field is not a rel_to_type else return a list of EmField
@@ -103,7 +102,7 @@ class EmField(EmComponent):
         return [f for f in self.model.components(EmField) if f.rel_field_id == self.uid]
 
     ## Check if the EmField is valid
-    # 
+    #
     # Check multiple things :
     # - the fieldgroup_id is valid
     # - the name is uniq in the EmClass
@@ -120,13 +119,12 @@ class EmField(EmComponent):
             raise EmComponentCheckError("fieldgroup_id contains an uid from a component that is not an EmFieldGroup but a %s" % str(type(em_fieldgroup)))
         """
         #Uniq Name check
-        if len([ f for f in self.em_class.fields() if f.name == self.name]) > 1:
-            raise EmComponentCheckError("The field %d has a name '%s' that is not uniq in the EmClass %d"%(self.uid, self.name, self.em_class.uid))
+        if len([f for f in self.em_class.fields() if f.name == self.name]) > 1:
+            raise EmComponentCheckError("The field %d has a name '%s' that is not uniq in the EmClass %d" % (self.uid, self.name, self.em_class.uid))
         #rel2type uniq check
         if self.fieldtype == 'rel2type':
             if len([f for f in self.em_class.fields() if f.fieldtype == 'rel2type' and f.rel_to_type_id == self.rel_to_type_id]) > 1:
-                raise EmComponentCheckError("The rel2type %d is not uniq, another field is linked to the same type '%s' in the same class '%s'"%(self.uid, self.model.component(self.rel_to_type_id).name, self.em_class.name))
-
+                raise EmComponentCheckError("The rel2type %d is not uniq, another field is linked to the same type '%s' in the same class '%s'" % (self.uid, self.model.component(self.rel_to_type_id).name, self.em_class.name))
 
     ## @brief Delete a field if it's not linked
     # @return bool : True if deleted False if deletion aborded