Merge lp:~zyga/linaro-python-json/1.1 into lp:linaro-python-json

[Zygmunt Krynicki]

This branch adds a small feature (support for schema default) and prepares for 1.1 release

[James Westby (james-w)]

review: Approve

=== modified file 'linaro_json/__init__.py'
--- linaro_json/__init__.py	2010-11-25 10:08:39 +0000
+++ linaro_json/__init__.py	2010-12-01 13:32:52 +0000
@@ -334,7 +334,7 @@
 )
 
 
-__version__ = (1, 0, 0, "final", 0)
+__version__ = (1, 1, 0, "final", 0)
 
 
 def get_version():
@@ -342,7 +342,7 @@
     Return a string representing the version of linaro_json package
     """
     major, minor, micro, releaselevel, serial = __version__
-    assert releaselevel in ('alpha', 'beta', 'candidate', 'final')
+    assert releaselevel in ('dev', 'alpha', 'beta', 'candidate', 'final')
     base_version = "%s.%s.%s" % (major, minor, micro)
     if releaselevel != 'final':
         base_version += "-%s" % releaselevel

=== modified file 'linaro_json/schema.py'
--- linaro_json/schema.py	2010-11-25 10:08:39 +0000
+++ linaro_json/schema.py	2010-12-01 13:32:52 +0000
@@ -20,7 +20,7 @@
 JSON schema validator for python
 Note: only a subset of schema features are currently supported.
 
-See: json-schema.org for details
+See: http://json-schema.org/ for details
 """
 import datetime
 import decimal
@@ -419,6 +419,13 @@
     def extends(self):
         raise NotImplementedError("extends property is not supported")
 
+    @property
+    def default(self):
+        try:
+            return self._schema["default"]
+        except KeyError:
+            raise SchemaError("There is no schema default for this item")
+
 
 class Validator(object):
     """

=== modified file 'linaro_json/tests/test_schema.py'
--- linaro_json/tests/test_schema.py	2010-11-25 10:08:39 +0000
+++ linaro_json/tests/test_schema.py	2010-12-01 13:32:52 +0000
@@ -743,6 +743,17 @@
             'raises': NotImplementedError(
                 "extends property is not supported"),
         }),
+        ('default_with_value', {
+            'schema': '{"default": 5}',
+            'expected': {
+                'default': 5
+            }
+        }),
+        ('default_without_value', {
+            'schema': '{}',
+            'access': 'default',
+            'raises': SchemaError("There is no schema default for this item"),
+        }),
     ]
 
     def test_schema_attribute(self):