python 3.5 support

tiramisu/autolib.py

@@ -263,13 +263,13 @@ def calculate(option, callback, is_validator, args, kwargs):
     if len(args) != 0 or len(kwargs) != 0:
         msg = _('unexpected error "{0}" in function "{1}" with arguments "{3}" and "{4}" '
                 'for option "{2}"').format(str(error),
-                                           callback.func_name,
+                                           callback.__name__,
                                            option.impl_get_display_name(),
                                            args,
                                            kwargs)
     else:
         msg = _('unexpected error "{0}" in function "{1}" for option "{2}"'
                 '').format(str(error),
-                           callback.func_name,
+                           callback.__name__,
                            option.impl_get_display_name())
     raise ConfigError(msg)

tiramisu/config.py

@@ -168,7 +168,10 @@ class SubConfig(object):
                     yield name, self.getattr(name,
                                              force_permissive=force_permissive)
                 except GeneratorExit:  # pragma: optional cover
-                    raise StopIteration
+                    if sys.version_info[0] < 3:
+                        raise StopIteration
+                    else:
+                        raise GeneratorExit()
                 except PropertiesOptionError:  # pragma: optional cover
                     pass  # option with properties
 
@@ -180,7 +183,10 @@ class SubConfig(object):
                 yield child.impl_getname(), self.getattr(child.impl_getname(),
                                                          force_permissive=force_permissive)
             except GeneratorExit:  # pragma: optional cover
-                raise StopIteration
+                if sys.version_info[0] < 3:
+                    raise StopIteration
+                else:
+                    raise GeneratorExit()
             except PropertiesOptionError:  # pragma: optional cover
                 pass  # option with properties
 
@@ -206,7 +212,10 @@ class SubConfig(object):
                         name = child.impl_getname()
                         yield name, self.getattr(name, force_permissive=force_permissive)
                 except GeneratorExit:  # pragma: optional cover
-                    raise StopIteration
+                    if sys.version_info[0] < 3:
+                        raise StopIteration
+                    else:
+                        raise GeneratorExit()
                 except PropertiesOptionError:  # pragma: optional cover
                     pass
     # ______________________________________________________________________

tiramisu/error.py

@@ -16,6 +16,7 @@
 # ____________________________________________________________
 "user defined exceptions"
 from .i18n import _
+import sys
 
 
 def display_list(lst, separator='and'):
@@ -27,21 +28,22 @@ def display_list(lst, separator='and'):
         return ''
     elif len(lst) == 1:
         ret = lst[0]
-        if isinstance(ret, unicode):
+        if sys.version_info[0] < 3 and isinstance(ret, unicode):
             ret = ret.encode('utf8')
         if not isinstance(ret, str):
             ret = str(ret)
         return ret
     else:
+        lst.sort()
         lst_ = []
         for l in lst[:-1]:
-            if isinstance(l, unicode):
+            if sys.version_info[0] < 3 and isinstance(l, unicode):
                 l = l.encode('utf8')
             elif not isinstance(l, str):
                 l = str(l)
             lst_.append(l)
         last = lst[-1]
-        if isinstance(last, unicode):
+        if sys.version_info[0] < 3 and isinstance(last, unicode):
             last = last.encode('utf8')
         if not isinstance(last, str):
             last = str(last)

tiramisu/option/baseoption.py

@@ -22,7 +22,11 @@ import re
 from types import FunctionType
 import warnings
 import sys
-from inspect import getargspec
+
+if sys.version_info[0] >= 3:
+    from inspect import signature
+else:
+    from inspect import getargspec
 
 from ..i18n import _
 from ..setting import log, undefined, debug, groups
@@ -180,13 +184,17 @@ class Base(StorageBase):
         self.commit(session)
 
     def _build_validator_params(self, validator, validator_params):
-        func_args = getargspec(validator)
-        defaults = func_args.defaults
-        if defaults is None:
-            defaults = []
-        args = func_args.args[0:len(func_args.args)-len(defaults)]
+        if sys.version_info[0] < 3:
+            func_args = getargspec(validator)
+            defaults = func_args.defaults
+            if defaults is None:
+                defaults = []
+            args = func_args.args[0:len(func_args.args)-len(defaults)]
+        else:
+            func_params = signature(validator).parameters
+            args = [f.name for f in func_params.values() if f.default is f.empty]
         if validator_params is not None:
-            kwargs = validator_params.keys()
+            kwargs = list(validator_params.keys())
             if '' in kwargs:
                 kwargs.remove('')
             for kwarg in kwargs:
@@ -454,7 +462,7 @@ class BaseOption(Base):
                 name = dyn_name
             else:
                 name = self.impl_getname()
-        if isinstance(name, unicode):
+        if sys.version_info[0] < 3 and isinstance(name, unicode):
             name = name.encode('utf8')
         return name
 
@@ -1024,7 +1032,7 @@ def validate_requires_arg(new_option, multi, requires, name):
         operator = get_operator(require)
         if isinstance(expected, list):
             for exp in expected:
-                if exp.keys() != ['option', 'value']:
+                if set(exp.keys()) != {'option', 'value'}:
                     raise ValueError(_('malformed requirements expected must have '
                                        'option and value for option {0}').format(name))
                 option = exp['option']

tiramisu/option/option.py

@@ -633,5 +633,5 @@ class DateOption(Option):
             return err
         try:
             datetime.datetime.strptime(value,"%Y-%m-%d")
-        except ValueError, err:
+        except ValueError:
             return ValueError()

tiramisu/storage/dictionary/option.py

@@ -75,7 +75,7 @@ class StorageBase(object):
         _setattr = object.__setattr__
         _setattr(self, '_name', name)
         if doc is not undefined:
-            if isinstance(doc, str):
+            if sys.version_info[0] < 3 and isinstance(doc, str):
                 doc = doc.decode('utf8')
             _setattr(self, '_informations', {'doc': doc})
             if multi != 1: