From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 25 Oct 2009 14:58:21 +0000 (+0000)
Subject: fix errant 2.6ism
X-Git-Tag: rel_0_6beta1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a77a0fd3eb909bb49b9e4e57edca4c5e5310ac9d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix errant 2.6ism
---

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 1fb7f2ed02..ba1a3f9076 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -926,13 +926,13 @@ class Enum(String, SchemaType):
         SchemaType.__init__(self, **kw)
         
     def adapt(self, impltype):
-        return impltype(*self.enums, 
-                        name=self.name, 
+        return impltype(name=self.name, 
                         quote=self.quote, 
                         schema=self.schema, 
                         metadata=self.metadata,
                         convert_unicode=self.convert_unicode,
-                        assert_unicode=self.assert_unicode
+                        assert_unicode=self.assert_unicode,
+                        *self.enums
                         )
 
 class PickleType(MutableType, TypeDecorator):