From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 17 Jul 2012 16:05:59 +0000 (-0400)
Subject: adjust the compat namedtuple to handle subclassing
X-Git-Tag: rel_0_8_0b1~320
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c214e436c2e9e1fde4ab5ebcf31dcc62ad1689cc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjust the compat namedtuple to handle subclassing
---

diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 215a68e913..9f8a3069dd 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -55,7 +55,7 @@ else:
 
 # a controversial feature, required by MySQLdb currently
 def buffer(x):
-    return x 
+    return x
 
 # Py2K
 buffer = buffer
@@ -121,7 +121,7 @@ try:
 except ImportError:
     def namedtuple(typename, fieldnames):
         def __new__(cls, *values):
-            tup = tuple.__new__(tuptype, values)
+            tup = tuple.__new__(cls, values)
             for i, fname in enumerate(fieldnames):
                 setattr(tup, fname, tup[i])
             return tup
@@ -231,7 +231,7 @@ import time
 if win32 or jython:
     time_func = time.clock
 else:
-    time_func = time.time 
+    time_func = time.time
 
 if sys.version_info >= (2, 5):
     any = any