Merge pull request #1 from jgoret/master

Python 3 compatibility

Author: pfw

.travis.yml

@@ -0,0 +1,20 @@
+sudo: false
+language: python
+
+python:
+  - "2.6"
+  - "2.7"
+  - "pypy"
+  - "3.3"
+  - "3.4"
+
+install:
+  - pip install pytest-cov
+  - pip install -e .
+
+script:
+  - py.test --cov=flask_zodb tests.py
+
+after_success:
+  - pip install coveralls
+  - coveralls

README.mkd

@@ -3,6 +3,9 @@ Flask-ZODB
 
 ![Flask-ZODB][logo]
 
+[![Build Status](https://travis-ci.org/Kyah/flask-zodb.svg)](https://travis-ci.org/Kyah/flask-zodb)
+[![Coverage Status](https://coveralls.io/repos/Kyah/flask-zodb/badge.svg?branch=master&service=github)](https://coveralls.io/github/Kyah/flask-zodb?branch=master)
+
 
 Simple extension for integrating the ZODB in Flask applications.
 

flask_zodb.py

@@ -2,7 +2,11 @@
 import transaction
 import zodburi
 
-from UserDict import IterableUserDict
+try:
+	from collections import UserDict
+except ImportError:
+	from UserDict import IterableUserDict as UserDict
+
 from ZODB.DB import DB
 from contextlib import contextmanager, closing
 from werkzeug.utils import cached_property
@@ -12,11 +16,15 @@
 from persistent.list import PersistentList as List
 from persistent.mapping import PersistentMapping as Dict
 
+try:
+	basestring
+except NameError:
+	basestring = str
 
 __all__ = ['ZODB', 'Object', 'List', 'Dict', 'BTree']
 
 
-class ZODB(IterableUserDict):
+class ZODB(UserDict):
     """Extension object.  Behaves as the root object of the storage during
     requests, i.e. a `~persistent.mapping.PersistentMapping`.