sqlite tests

diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
index 4a86d38d2873fad789d54df10fd17ba5cc10dc96..32ee1299fd13888edd9fb732924e9ba8b54ce27d 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -267,9 +267,7 @@ class SQLiteDialect_pysqlite(SQLiteDialect):
         }
     )
 
-# start Py3K
     description_encoding = None
-# end Py3K
 
     driver = 'pysqlite'
 

diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 12edab3e1d9911680150053b74582018e105100c..91740dc16f024fd35351fd3d59c50c981d85c458 100644 (file)
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -232,7 +232,7 @@ def bind_values(clause):
 
 
 def _quote_ddl_expr(element):
-    if isinstance(element, str):
+    if isinstance(element, util.string_types):
         element = element.replace("'", "''")
         return "'%s'" % element
     else:
@@ -765,7 +765,7 @@ class AliasedRow(object):
         return self.row[self.map[key]]
 
     def keys(self):
-        return list(self.row.keys())
+        return self.row.keys()
 
 
 class ClauseAdapter(visitors.ReplacingCloningVisitor):

diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
index 440fe1f433829d8e84225b3e837640b7795b7694..5410a64cbd9d48b20327b9ff269de9c7c8734073 100644 (file)
--- a/test/dialect/test_sqlite.py
+++ b/test/dialect/test_sqlite.py
@@ -4,7 +4,7 @@ from sqlalchemy.testing import eq_, assert_raises, \
     assert_raises_message
 import datetime
 from sqlalchemy import *
-from sqlalchemy import exc, sql, schema, pool, types as sqltypes
+from sqlalchemy import exc, sql, schema, pool, types as sqltypes, util
 from sqlalchemy.dialects.sqlite import base as sqlite, \
     pysqlite as pysqlite_dialect
 from sqlalchemy.engine.url import make_url
@@ -84,7 +84,7 @@ class TestTypes(fixtures.TestBase, AssertsExecutionResults):
             eq_(row, (1, datetime.date(2010, 5, 10),
             datetime.datetime( 2010, 5, 10, 12, 15, 25, )))
             r = engine.execute(func.current_date()).scalar()
-            assert isinstance(r, str)
+            assert isinstance(r, util.string_types)
         finally:
             t.drop(engine)
             engine.dispose()
@@ -104,8 +104,8 @@ class TestTypes(fixtures.TestBase, AssertsExecutionResults):
             UnicodeText(),
             ):
             bindproc = t.dialect_impl(dialect).bind_processor(dialect)
-            assert not bindproc or isinstance(bindproc('some string'),
-                    str)
+            assert not bindproc or \
+                isinstance(bindproc(util.u('some string')), util.text_type)
 
     @testing.provide_metadata
     def test_type_reflection(self):
@@ -602,7 +602,7 @@ class SQLTest(fixtures.TestBase, AssertsCompiledSQL):
             'dow': '%w',
             'week': '%W',
             }
-        for field, subst in list(mapping.items()):
+        for field, subst in mapping.items():
             self.assert_compile(select([extract(field, t.c.col1)]),
                                 "SELECT CAST(STRFTIME('%s', t.col1) AS "
                                 "INTEGER) AS anon_1 FROM t" % subst)