PEP8/PyLint on EditorialModel/fieldtypes

EditorialModel/fieldtypes/bool.py

@@ -2,14 +2,15 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'A basic boolean field'
 
-    ftype='bool'
+    ftype = 'bool'
 
     ## @brief A char field
     # @brief max_length int : The maximum length of this field
     def __init__(self, **kwargs):
-        super(EmFieldType, self).__init__(ftype='bool',**kwargs)
+        super(EmFieldType, self).__init__(ftype='bool', **kwargs)
 

EditorialModel/fieldtypes/char.py

@@ -2,15 +2,16 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'Basic string (varchar) field. Take max_length=64 as option'
 
-    ftype='char'
+    ftype = 'char'
 
     ## @brief A char field
     # @brief max_length int : The maximum length of this field
     def __init__(self, max_length=64, **kwargs):
         self.max_length = max_length
-        super(EmFieldType, self).__init__(ftype = 'char', **kwargs)
+        super(EmFieldType, self).__init__(ftype='char', **kwargs)
 

EditorialModel/fieldtypes/datetime.py

@@ -2,11 +2,12 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'A datetime field. Take two boolean options now_on_update and now_on_create'
 
-    ftype='datetime'
+    ftype = 'datetime'
 
     ## @brief A datetime field
     # @param now_on_update bool : If true the date is set to NOW on update
@@ -15,5 +16,4 @@ class EmFieldType(GenericFieldType):
     def __init__(self, now_on_update=False, now_on_create=False, **kwargs):
         self.now_on_update = now_on_update
         self.now_on_create = now_on_create
-        super(EmFieldType, self).__init__(ftype='datetime',**kwargs)
-
+        super(EmFieldType, self).__init__(ftype='datetime', **kwargs)

EditorialModel/fieldtypes/file.py

@@ -2,15 +2,15 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'A file field. With one options upload_path'
 
-    ftype='char'
+    ftype = 'char'
 
     ## @brief A char field
     # @brief max_length int : The maximum length of this field
     def __init__(self, upload_path=None, **kwargs):
         self.upload_path = upload_path
-        super(EmFieldType, self).__init__(ftype='char', max_length=512,**kwargs)
-
+        super(EmFieldType, self).__init__(ftype='char', max_length=512, **kwargs)

EditorialModel/fieldtypes/generic.py

@@ -3,17 +3,18 @@
 import types
 import importlib
 
+
 ## @brief Abstract class representing a fieldtype
 class GenericFieldType(object):
-    
+
     ## @brief Text describing the fieldtype
     help = 'Generic field type : abstract class for every fieldtype'
     ## @brief Allowed type for handled datas
     _allowed_ftype = ['char', 'str', 'int', 'bool', 'datetime', 'text', 'rel2type']
-    
+
     ## @brief The basic lowlevel value type
     ftype = None
-    
+
     ## @brief Instanciate a new fieldtype
     # @param ftype str : The type of datas handled by this fieldtype
     # @param nullable bool : is None allowed as value ?
@@ -24,23 +25,23 @@ class GenericFieldType(object):
     # @throw NotImplementedError if called directly
     # @throw AttributeError if bad ftype
     # @throw AttributeError if bad check_function
-    def __init__(self, ftype, nullable = True, check_function = None, uniq = False, primary=False, **kwargs):
+    def __init__(self, ftype, nullable=True, check_function=None, uniq=False, primary=False, **kwargs):
         if self.__class__ == GenericFieldType:
             raise NotImplementedError("Abstract class")
-        
+
         if self.ftype is None:
-            raise RuntimeError("The class attribute ftype is not properly set by the %s EmFieldType"%self.name)
+            raise RuntimeError("The class attribute ftype is not properly set by the %s EmFieldType" % self.name)
 
         if ftype not in self._allowed_ftype:
-            raise AttributeError("Ftype '%s' not known"%ftype)
-        
+            raise AttributeError("Ftype '%s' not known" % ftype)
+
         if check_function is None:
             check_function = self.dummy_check
         elif not isinstance(check_function, types.FunctionType):
             raise AttributeError("check_function argument has to be a function")
 
         if ftype != self.__class__.ftype:
-            raise RuntimeError("The ftype is not the same for the instance and the class. Maybe %s reimplement ftype at class level but shouldn't"%self.name)
+            raise RuntimeError("The ftype is not the same for the instance and the class. Maybe %s reimplement ftype at class level but shouldn't" % self.name)
 
         self.ftype = ftype
         self.check_function = check_function
@@ -50,16 +51,16 @@ class GenericFieldType(object):
         if 'default' in kwargs:
             self.check_or_raise(kwargs['default'])
             self.default = kwargs['default']
-            del(kwargs['default'])
+            del kwargs['default']
 
-        for argname,argvalue in kwargs.items():
+        for argname, argvalue in kwargs.items():
             setattr(self, argname, argvalue)
-    
+
     ## @return A fieldtype name from an instance
     @property
     def name(self):
         return self.__module__.split('.')[-1]
-    
+
     ## @brief Check if a value is correct
     # @param value * : The value
     # @throw TypeError if not valid
@@ -80,17 +81,15 @@ class GenericFieldType(object):
     # @return a string representing a python module name
     @staticmethod
     def module_name(fieldtype_name):
-        return 'EditorialModel.fieldtypes.%s'%(fieldtype_name)
+        return 'EditorialModel.fieldtypes.%s' % (fieldtype_name)
 
     ## @brief __hash__ implementation for fieldtypes
     def __hash__(self):
-        hash_dats = [ self.__class__.__module__ ]
+        hash_dats = [self.__class__.__module__]
         for kdic in sorted([k for k in self.__dict__.keys() if not k.startswith('_')]):
             hash_dats.append((kdic, getattr(self, kdic)))
         return hash(tuple(hash_dats))
 
-
-    
     ## @brief Transform a value into a valid python representation according to the fieldtype
     # @param value ? : The value to cast
     # @param kwargs dict : optionnal cast arguments
@@ -99,9 +98,9 @@ class GenericFieldType(object):
     # @throw TypeError if the cast is not possible
     def cast(self, value, **kwargs):
         if len(kwargs) > 0:
-            raise AttributeError("No optionnal argument allowed for %s cast method"%self.__class__.__name__)
+            raise AttributeError("No optionnal argument allowed for %s cast method" % self.__class__.__name__)
         return value
-    
+
     ## @brief Check if a value is correct
     # @param value * : The value to check
     # @return True if valid else False
@@ -120,6 +119,6 @@ class GenericFieldType(object):
             raise TypeError("Not nullable field")
         self.check_function(value)
 
+
 class FieldTypeError(Exception):
     pass
-

EditorialModel/fieldtypes/integer.py

@@ -2,6 +2,7 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'Basic integer field'
@@ -13,9 +14,9 @@ class EmFieldType(GenericFieldType):
         try:
             int(value)
         except ValueError:
-            raise TypeError("the value '%s' is not, and will never be an integer"%value)
+            raise TypeError("the value '%s' is not, and will never be an integer" % value)
 
     def __init__(self, **kwargs):
         if 'check_function' not in kwargs:
             kwargs['check_function'] = self.check_fun
-        super(EmFieldType, self).__init__(ftype='int',**kwargs)
+        super(EmFieldType, self).__init__(ftype='int', **kwargs)

EditorialModel/fieldtypes/pk.py

@@ -2,9 +2,10 @@
 
 import EditorialModel.fieldtypes.integer
 
+
 ## @todo This EmFieldType is a bit dirty....
 class EmFieldType(EditorialModel.fieldtypes.integer.EmFieldType):
-    
+
     help = 'Integer primary key fieldtype'
 
     def __init__(self, **kwargs):
@@ -18,10 +19,10 @@ class EmFieldType(EditorialModel.fieldtypes.integer.EmFieldType):
         # Checking args
         for name, value in kwargs.items():
             if name not in allowed:
-                raise TypeError("Got an unexpected argument '%s' for pk EmFieldType"%name)
+                raise TypeError("Got an unexpected argument '%s' for pk EmFieldType" % name)
             if value != allowed[name]:
-                raise ValueError("The value '%s' for argument '%s' for pk EmFieldType is not allowed"%(value, name))
-        
+                raise ValueError("The value '%s' for argument '%s' for pk EmFieldType is not allowed" % (value, name))
+
         kwargs.update(allowed)
 
         super(EmFieldType, self).__init__(**kwargs)

EditorialModel/fieldtypes/regexchar.py

@@ -3,20 +3,20 @@
 import re
 import EditorialModel
 
+
 class EmFieldType(EditorialModel.fieldtypes.char.EmFieldType):
 
-    help = 'String field validated with a regex. Take two optionss : max_length and regex'
+    help = 'String field validated with a regex. Take two options : max_length and regex'
 
     ## @brief A char field validated with a regex
     # @param regex str : a regex string (passed as argument to re.compile() )
     # @param max_length int : the maximum length for this field
     # @param **kwargs
-    def __init__(self, regex='', max_length = 10, **kwargs):
+    def __init__(self, regex='', max_length=10, **kwargs):
         self.regex = regex
         v_re = re.compile(regex)  # trigger an error if invalid regex
-        
+
         def re_match(value):
             if not v_re.match(regex, value):
-                raise TypeError('"%s" don\'t match the regex "%s"'%(value, regex))
+                raise TypeError('"%s" don\'t match the regex "%s"' % (value, regex))
         super(EmFieldType, self).__init__(check_function=re_match, max_length=max_length, **kwargs)
-

EditorialModel/fieldtypes/rel2type.py

@@ -1,20 +1,21 @@
 #-*- coding: utf-8 -*-
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
+from EditorialModel.fields import EmField
+
 
 class EmFieldType(GenericFieldType):
 
     help = 'Relationnal field (relation2type). Take rel_to_type_id as option (an EmType uid)'
 
-    ftype='rel2type'
+    ftype = 'rel2type'
 
     def __init__(self, rel_to_type_id, **kwargs):
         self.rel_to_type_id = rel_to_type_id
-        super(EmFieldType, self).__init__(ftype='rel2type',**kwargs)
+        super(EmFieldType, self).__init__(ftype='rel2type', **kwargs)
 
     def get_related_type(self):
         return self.model.component(self.rel_to_type_id)
 
     def get_related_fields(self):
         return [f for f in self.model.components(EmField) if f.rel_field_id == self.uid]
-

EditorialModel/fieldtypes/text.py

@@ -2,12 +2,13 @@
 
 from EditorialModel.fieldtypes.generic import GenericFieldType
 
+
 class EmFieldType(GenericFieldType):
 
     help = 'A text field (big string)'
 
-    ftype='text'
+    ftype = 'text'
 
     def __init__(self, **kwargs):
-        super(EmFieldType, self).__init__(ftype='text',**kwargs)
+        super(EmFieldType, self).__init__(ftype='text', **kwargs)