remove all remaining start/end py2k/py3k blocks

5 files changed, 35 insertions, 41 deletions

diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py
index 6770ed8e7..1c42d4846 100644
--- a/lib/sqlalchemy/dialects/sybase/base.py
+++ b/lib/sqlalchemy/dialects/sybase/base.py
@@ -475,12 +475,11 @@ class SybaseDialect(default.DefaultDialect):
               AND o.type in ('U', 'V')
         """)
 
-# start Py2K
-#        if isinstance(schema, unicode):
-#            schema = schema.encode("ascii")
-#        if isinstance(table_name, unicode):
-#            table_name = table_name.encode("ascii")
-# end Py2K
+        if util.py2k:
+            if isinstance(schema, unicode):
+                schema = schema.encode("ascii")
+            if isinstance(table_name, unicode):
+                table_name = table_name.encode("ascii")
         result = connection.execute(TABLEID_SQL,
                                     schema_name=schema,
                                     table_name=table_name)
@@ -759,10 +758,10 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'U'
         """)
 
-# start Py2K
-#        if isinstance(schema, unicode):
-#            schema = schema.encode("ascii")
-# end Py2K
+        if util.py2k:
+            if isinstance(schema, unicode):
+                schema = schema.encode("ascii")
+
         tables = connection.execute(TABLE_SQL, schema_name=schema)
 
         return [t["name"] for t in tables]
@@ -779,10 +778,10 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'V'
         """)
 
-# start Py2K
-#        if isinstance(view_name, unicode):
-#            view_name = view_name.encode("ascii")
-# end Py2K
+        if util.py2k:
+            if isinstance(view_name, unicode):
+                view_name = view_name.encode("ascii")
+
         view = connection.execute(VIEW_DEF_SQL, view_name=view_name)
 
         return view.scalar()
@@ -799,10 +798,9 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'V'
         """)
 
-# start Py2K
-#        if isinstance(schema, unicode):
-#            schema = schema.encode("ascii")
-# end Py2K
+        if util.py2k:
+            if isinstance(schema, unicode):
+                schema = schema.encode("ascii")
         views = connection.execute(VIEW_SQL, schema_name=schema)
 
         return [v["name"] for v in views]
diff --git a/lib/sqlalchemy/orm/evaluator.py b/lib/sqlalchemy/orm/evaluator.py
index 458eab7a1..7a11cd450 100644
--- a/lib/sqlalchemy/orm/evaluator.py
+++ b/lib/sqlalchemy/orm/evaluator.py
@@ -13,9 +13,7 @@ class UnevaluatableError(Exception):
 
 _straight_ops = set(getattr(operators, op)
                     for op in ('add', 'mul', 'sub',
-# start Py2K
-#                                'div',
-# end Py2K
+                                'div',
                                 'mod', 'truediv',
                                'lt', 'le', 'ne', 'gt', 'ge', 'eq'))
 
diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py
index f2d0df43f..368a6a0b1 100644
--- a/lib/sqlalchemy/orm/instrumentation.py
+++ b/lib/sqlalchemy/orm/instrumentation.py
@@ -446,23 +446,21 @@ def __init__(%(apply_pos)s):
     func_vars = util.format_argspec_init(original__init__, grouped=False)
     func_text = func_body % func_vars
 
-# start Py3K
-    func_defaults = getattr(original__init__, '__defaults__', None)
-    func_kw_defaults = getattr(original__init__, '__kwdefaults__', None)
-# end Py3K
-# start Py2K
-#    func = getattr(original__init__, 'im_func', original__init__)
-#    func_defaults = getattr(func, 'func_defaults', None)
-# end Py2K
+    if util.py2k:
+        func = getattr(original__init__, 'im_func', original__init__)
+        func_defaults = getattr(func, 'func_defaults', None)
+    else:
+        func_defaults = getattr(original__init__, '__defaults__', None)
+        func_kw_defaults = getattr(original__init__, '__kwdefaults__', None)
 
     env = locals().copy()
     exec(func_text, env)
     __init__ = env['__init__']
     __init__.__doc__ = original__init__.__doc__
+
     if func_defaults:
         __init__.__defaults__ = func_defaults
-# start Py3K
-    if func_kw_defaults:
+    if not util.py2k and func_kw_defaults:
         __init__.__kwdefaults__ = func_kw_defaults
-# end Py3K
+
     return __init__
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
index 5facd2f06..1288902f2 100644
--- a/lib/sqlalchemy/testing/util.py
+++ b/lib/sqlalchemy/testing/util.py
@@ -1,4 +1,4 @@
-from ..util import jython, pypy, defaultdict, decorator
+from ..util import jython, pypy, defaultdict, decorator, py2k
 import decimal
 import gc
 import time
@@ -32,13 +32,13 @@ else:
 
 def picklers():
     picklers = set()
-# start Py2K
-#    try:
-#        import cPickle
-#        picklers.add(cPickle)
-#    except ImportError:
-#        pass
-# end Py2K
+    if py2k:
+        try:
+            import cPickle
+            picklers.add(cPickle)
+        except ImportError:
+            pass
+
     import pickle
     picklers.add(pickle)
 
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index b0ff5b073..1ff868e01 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -884,7 +884,7 @@ def dictlike_iteritems(dictlike):
 
     if hasattr(dictlike, 'iterkeys'):
         def iterator():
-            for key in dictlike.keys():
+            for key in dictlike.iterkeys():
                 yield key, getter(key)
         return iterator()
     elif hasattr(dictlike, 'keys'):