Fix method decorator.

Author: James William Pye

postgresql/documentation/changes.py

@@ -10,6 +10,7 @@
 -----
 
  * Fix encoding normalization.
+ * Fix "method" decorator to return callable when val is None.
 
 0.8.0 released on 2009-04-03
 ----------------------------

postgresql/python/decorlib.py

@@ -40,4 +40,6 @@ class method(object):
 	def __init__(self, callable):
 		self.callable = callable
 	def __get__(self, val, typ):
-		return types.MethodType(self.callable, val or typ)
+		if val is None:
+			return self.callable
+		return types.MethodType(self.callable, val)

postgresql/test/test_python.py

@@ -30,6 +30,10 @@ def testComposition(self):
 		self.failUnlessEqual("100", simple("100"))
 		timesfour_fourtimes = compose((methodcaller('__mul__', 4),)*4)
 		self.failUnlessEqual(4*(4*4*4*4), timesfour_fourtimes(4))
+		nothing = compose(())
+		self.failUnlessEqual(nothing("100"), "100")
+		self.failUnlessEqual(nothing(100), 100)
+		self.failUnlessEqual(nothing(None), None)
 
 	def testRSetAttr(self):
 		class anob(object):