Merge branch 'rel_0_9'

Conflicts:
	lib/sqlalchemy/dialects/postgresql/hstore.py
	lib/sqlalchemy/util/__init__.py
	lib/sqlalchemy/util/compat.py

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
index d9ff14eaf..5facd2f06 100644
--- a/lib/sqlalchemy/testing/util.py
+++ b/lib/sqlalchemy/testing/util.py
@@ -32,13 +32,13 @@ else:
 
 def picklers():
     picklers = set()
-    # Py2K
-    try:
-        import cPickle
-        picklers.add(cPickle)
-    except ImportError:
-        pass
-    # end Py2K
+# start Py2K
+#    try:
+#        import cPickle
+#        picklers.add(cPickle)
+#    except ImportError:
+#        pass
+# end Py2K
     import pickle
     picklers.add(pickle)
 
@@ -130,8 +130,8 @@ def function_named(fn, name):
     try:
         fn.__name__ = name
     except TypeError:
-        fn = types.FunctionType(fn.func_code, fn.func_globals, name,
-                          fn.func_defaults, fn.func_closure)
+        fn = types.FunctionType(fn.__code__, fn.__globals__, name,
+                          fn.__defaults__, fn.__closure__)
     return fn