remove all remaining start/end py2k/py3k blocks

1 files changed, 9 insertions, 11 deletions

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__