Merge lp:~allenap/storm/json-property into lp:storm

[Gavin Panella]

This builds on Jamu's json-property branch (see the prerequisite) and fixes the things that Thomas requested.

[lp:~allenap/storm/json-property]

399. By Gavin Panella on 2011-09-07

Merge lp:~jkakar/storm/json-property, resolving conflicts.

400. By Gavin Panella on 2011-09-07

Fall back to simplejson if json is not available, and degrade gracefully if no JSON support is available at all.

=== added file 'storm/compat.py'
--- storm/compat.py	1970-01-01 00:00:00 +0000
+++ storm/compat.py	2011-09-07 14:06:25 +0000
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2011 Canonical
+#
+# Written by Gustavo Niemeyer <[e-mail]>
+#
+# This file is part of Storm Object Relational Mapper.
+#
+# Storm is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# Storm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+__all__ = [
+    "json",
+    ]
+
+try:
+    import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        json = None
 
=== modified file 'storm/locals.py'
--- storm/locals.py	2011-09-07 14:06:25 +0000
+++ storm/locals.py	2011-09-07 14:06:25 +0000
@@ -18,15 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-<<<<<<< TREE
-from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode, Pickle
+from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode
 from storm.properties import List, Decimal, DateTime, Date, Time, Enum, UUID
-from storm.properties import TimeDelta
-=======
-from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode
-from storm.properties import List, Decimal, DateTime, Date, Time, Enum
 from storm.properties import TimeDelta, Pickle, JSON
->>>>>>> MERGE-SOURCE
 from storm.references import Reference, ReferenceSet, Proxy
 from storm.database import create_database
 from storm.exceptions import StormError
 
=== modified file 'storm/variables.py'
--- storm/variables.py	2011-09-07 14:06:25 +0000
+++ storm/variables.py	2011-09-07 14:06:25 +0000
@@ -21,13 +21,13 @@
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
 import cPickle as pickle
-import json
 import re
 try:
     import uuid
 except ImportError:
     uuid = None
 
+from storm.compat import json
 from storm.exceptions import NoneError
 from storm import Undef, has_cextensions
 
@@ -625,6 +625,13 @@
 
 class JSONVariable(EncodedValueVariable):
 
+    __slots__ = ()
+
+    def __init__(self, *args, **kwargs):
+        assert json is not None, (
+            "Neither the json nor the simplejson module was found.")
+        super(JSONVariable, self).__init__(*args, **kwargs)
+
     def _loads(self, value):
         return json.loads(value)
 
 
=== modified file 'tests/properties.py'
--- tests/properties.py	2011-09-07 14:06:25 +0000
+++ tests/properties.py	2011-09-07 14:06:25 +0000
@@ -26,6 +26,7 @@
 except ImportError:
     uuid = None
 
+from storm.compat import json
 from storm.exceptions import NoneError, PropertyPathError
 from storm.properties import PropertyPublisherMeta
 from storm.properties import *
@@ -694,6 +695,10 @@
         self.assertEquals(changes, [(self.variable1, None, ["a"], False)])
 
     def test_json(self):
+        # Skip test if json support is not available.
+        if json is None:
+            return
+
         self.setup(JSON, default_factory=dict, allow_none=False)
 
         self.assertTrue(isinstance(self.column1, Column))
@@ -716,6 +721,10 @@
         self.assertEquals(self.obj.prop1, ["a"])
 
     def test_json_events(self):
+        # Skip test if json support is not available.
+        if json is None:
+            return
+
         self.setup(JSON, default_factory=list, allow_none=False)
 
         changes = []
 
=== modified file 'tests/variables.py'
--- tests/variables.py	2011-09-07 14:06:25 +0000
+++ tests/variables.py	2011-09-07 14:06:25 +0000
@@ -22,13 +22,13 @@
 from decimal import Decimal
 import cPickle as pickle
 import gc
-import json
 import weakref
 try:
     import uuid
 except ImportError:
     uuid = None
 
+from storm.compat import json
 from storm.exceptions import NoneError
 from storm.variables import *
 from storm.event import EventSystem
@@ -902,6 +902,9 @@
     encoding = json
     variable_type = JSONVariable
 
+    def is_supported(self):
+        return json is not None
+
 
 class ListVariableTest(TestHelper):