py31, py32 support

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - 2.6
   - 2.7
+  - 3.1
   - 3.2
   - 3.3
   - pypy

werobot/session/filestorage.py

@@ -1,13 +1,11 @@
-import json
-
 try:
     import anydbm as dbm
     assert dbm
 except ImportError:
     import dbm
 
 from . import SessionStorage
-from werobot.utils import py3k
+from werobot.utils import json_loads, json_dumps
 
 
 class FileStorage(SessionStorage):
@@ -16,12 +14,10 @@ def __init__(self, filename='werobot_session'):
 
     def get(self, id):
         session_json = self.db.get(id, "{}")
-        if py3k:
-            session_json = session_json.decode()
-        return json.loads(session_json)
+        return json_loads(session_json)
 
     def set(self, id, value):
-        self.db[id] = json.dumps(value)
+        self.db[id] = json_dumps(value)
 
     def delete(self, id):
         del self.db[id]

werobot/session/mongodbstorage.py

@@ -1,7 +1,5 @@
-import json
-
 from . import SessionStorage
-from werobot.utils import py3k
+from werobot.utils import json_loads, json_dumps
 
 
 class MongoDBStorage(SessionStorage):
@@ -19,14 +17,12 @@ def get(self, id):
         document = self._get_document(id)
         if document:
             session_json = document["session"]
-            if py3k:
-                session_json = session_json.decode()
-            return json.loads(session_json)
+            return json_loads(session_json)
         return {}
 
     def set(self, id, value):
         document = self._get_document(id)
-        session = json.dumps(value)
+        session = json_dumps(value)
         if document:
             document["session"] = session
             self.collection.save(document)

werobot/session/redisstorage.py

@@ -1,7 +1,5 @@
-import json
-
 from . import SessionStorage
-from werobot.utils import py3k
+from werobot.utils import json_loads, json_dumps
 
 
 class RedisStorage(SessionStorage):
@@ -17,13 +15,11 @@ def key_name(self, s):
     def get(self, id):
         id = self.key_name(id)
         session_json = self.redis.get(id)
-        if py3k:
-            session_json = session_json.decode()
-        return json.loads(session_json)
+        return json_loads(session_json)
 
     def set(self, id, value):
         id = self.key_name(id)
-        self.redis.set(json.dumps(value))
+        self.redis.set(json_dumps(value))
 
     def delete(self, id):
         id = self.key_name(id)

werobot/utils.py

@@ -3,6 +3,7 @@
 import random
 import time
 import logging
+import json
 
 try:
     import curses
@@ -117,3 +118,12 @@ def format(self, record):
         if record.exc_text:
             formatted = formatted.rstrip() + "\n" + record.exc_text
         return formatted.replace("\n", "\n    ")
+
+
+def json_loads(s):
+    s = to_unicode(s)
+    return json.loads(s)
+
+
+def json_dumps(d):
+    return json.dumps(d)