Correct test after merge and correct support for python3

Author: ymph

rdflib_sqlalchemy/SQLAlchemy.py

@@ -27,6 +27,9 @@
 
 if PY3:
     from functools import reduce
+    from urllib.parse import unquote_plus
+else:
+    from urllib import unquote_plus
 
 _logger = logging.getLogger(__name__)
 
@@ -107,7 +110,7 @@ def _parse_rfc1738_args(name):
         opts = {'username': username, 'password': password, 'host':
                 host, 'port': port, 'database': database, 'query': query}
         if opts['password'] is not None:
-            opts['password'] = urllib.unquote_plus(opts['password'])
+            opts['password'] = unquote_plus(opts['password'])
         return (name, opts)
     else:
         raise ValueError("Could not parse rfc1738 URL from string '%s'" % name)
@@ -1124,7 +1127,7 @@ def bind(self, prefix, namespace):
         """ """
         with self.engine.connect() as connection:
             try:
-                ins = self.tables['namespace_binds'].insert().values(prefix=prefix, uri=namesapce)
+                ins = self.tables['namespace_binds'].insert().values(prefix=prefix, uri=namespace)
                 connection.execute(ins)
             except Exception:
                 e = sys.exc_info()[1]

test/context_case.py

@@ -182,10 +182,10 @@ def cid(c):
             if (PY3 and not isinstance(c,(str, bytes))) or not isinstance(c, basestring):
                 return c.identifier
             return c
-        self.assert_(self.c1 in map(cid, self.graph.contexts()))
-        self.assert_(self.c2 in map(cid, self.graph.contexts()))
+        self.assert_(self.c1 in list(map(cid, self.graph.contexts())))
+        self.assert_(self.c2 in list(map(cid, self.graph.contexts())))
 
-        contextList = map(cid, list(self.graph.contexts(triple)))
+        contextList = list(map(cid, list(self.graph.contexts(triple))))
         self.assert_(self.c1 in contextList)
         self.assert_(self.c2 in contextList)
 

test/test_sqlalchemy_postgresql.py

@@ -9,8 +9,8 @@
     raise SkipTest("psycopg2 not installed, skipping PgSQL tests")
 import logging
 _logger = logging.getLogger(__name__)
-import context_case
-import graph_case
+from . import context_case
+from . import graph_case
 
 sqlalchemy_url = os.environ.get(
     'DBURI',