python 3.5 support

tests/test_simple.py

@@ -0,0 +1,14 @@
+from json import loads
+from tiramisu_api import Config
+from pytest import raises
+
+
+def test_list_option():
+    filename = 'tests/data/boolean1.json'
+    with open(filename, 'r') as fh:
+        json = loads(fh.read())
+    #
+    config = Config(json)
+    opts = []
+    raises(AttributeError, "config.option('unknown').value.get()")
+    raises(AttributeError, "config.option('options.unknown').value.get()")

tiramisu_api/__init__.py

@@ -1,5 +1,5 @@
 from .api import Config
 
-__version__ = "0.1"
+__version__ = "0.2"
 __all__ = ('Config',)
 

tiramisu_api/api.py

@@ -75,6 +75,12 @@ class TiramisuOptionOption:
         self.schema = schema
 
     def doc(self):
+        description = self.description()
+        if not description:
+            return self.name()
+        return description
+
+    def description(self):
         if self.issymlinkoption():
             schema = self.config.get_schema(self.schema['opt_path'])
         else:
@@ -805,12 +811,16 @@ class Config:
             subpaths = path.split('.')[len(root):]
         else:
             subpaths = path.split('.')
+        current_subpath = 'root'
         for subpath in subpaths:
             if root_path:
                 root_path += '.' + subpath
             else:
                 root_path = subpath
-            schema = schema['properties'][root_path]
+            schema = schema['properties'].get(root_path)
+            if schema is None:
+                raise AttributeError(_('option "{0}" inconnue dans l\'optiondescription "{1}"').format(subpath, current_subpath))
+            current_subpath = subpath
         return schema
 
     def isleader(self,

tiramisu_api/error.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.error import APIError, ValueWarning, ValueOptionError, ValueErrorWarning, PropertiesOptionError, ConfigError, display_list
-except ModuleNotFoundError:
+except ImportError:
     import weakref
     from .i18n import _
 
@@ -130,7 +130,7 @@ except ModuleNotFoundError:
             if self.msg:
                 return self.msg
             if self._option_bag is None:
-                return "unknown error"
+                return "option désactivée"
             req = self._settings.apply_requires(self._option_bag,
                                                 True)
             # if req != {} or self._orig_opt is not None:

tiramisu_api/i18n.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.i18n import _
-except ModuleNotFoundError:
+except ImportError:
     # FIXME
     def _(val):
         return val

tiramisu_api/setting.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.setting import undefined
-except ModuleNotFoundError:
+except ImportError:
     class Undefined(object):
         def __str__(self):
             return 'Undefined'