- the raw 2to3 run

- went through examples/ and cleaned out excess list() calls

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 90f21db09..cf4a1d532 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -41,8 +41,8 @@ def cache(fn, self, con, *args, **kw):
         return fn(self, con, *args, **kw)
     key = (
             fn.__name__,
-            tuple(a for a in args if isinstance(a, basestring)),
-            tuple((k, v) for k, v in kw.iteritems() if isinstance(v, (basestring, int, float)))
+            tuple(a for a in args if isinstance(a, str)),
+            tuple((k, v) for k, v in kw.items() if isinstance(v, (str, int, float)))
         )
     ret = info_cache.get(key)
     if ret is None:
@@ -381,16 +381,16 @@ class Inspector(object):
         # table.kwargs will need to be passed to each reflection method.  Make
         # sure keywords are strings.
         tblkw = table.kwargs.copy()
-        for (k, v) in tblkw.items():
+        for (k, v) in list(tblkw.items()):
             del tblkw[k]
             tblkw[str(k)] = v
 
-        # Py2K
-        if isinstance(schema, str):
-            schema = schema.decode(dialect.encoding)
-        if isinstance(table_name, str):
-            table_name = table_name.decode(dialect.encoding)
-        # end Py2K
+# start Py2K
+#        if isinstance(schema, str):
+#            schema = schema.decode(dialect.encoding)
+#        if isinstance(table_name, str):
+#            table_name = table_name.decode(dialect.encoding)
+# end Py2K
 
         # columns
         found_table = False