[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

please unblock sqlalchemy 0.4.7p1-2



Hi,

Please unblock sqlalchemy 0.4.7p1-2. I added a patch that fixes two
mistakes in object names (only 3 lines changed in upstream sources) and
closes #494948.

I'm attaching debdiff.

TIA
diff -u sqlalchemy-0.4.7p1/debian/changelog sqlalchemy-0.4.7p1/debian/changelog
--- sqlalchemy-0.4.7p1/debian/changelog
+++ sqlalchemy-0.4.7p1/debian/changelog
@@ -1,3 +1,10 @@
+sqlalchemy (0.4.7p1-2) unstable; urgency=low
+
+  * Fixed typos in orm/mapper.py and schema.py (closes: #494948, thanks
+    Sebastian)
+
+ -- Piotr Ożarowski <piotr@debian.org>  Thu, 04 Sep 2008 21:20:49 +0200
+
 sqlalchemy (0.4.7p1-1) unstable; urgency=low
 
   * New upstream release
diff -u sqlalchemy-0.4.7p1/debian/patches/series sqlalchemy-0.4.7p1/debian/patches/series
--- sqlalchemy-0.4.7p1/debian/patches/series
+++ sqlalchemy-0.4.7p1/debian/patches/series
@@ -1 +1,2 @@
+fix_typos.patch
 disable_ez_setup.patch
only in patch2:
unchanged:
--- sqlalchemy-0.4.7p1.orig/debian/patches/fix_typos.patch
+++ sqlalchemy-0.4.7p1/debian/patches/fix_typos.patch
@@ -0,0 +1,35 @@
+Index: sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/mapper.py
+===================================================================
+--- sqlalchemy-0.4.7p1.orig/lib/sqlalchemy/orm/mapper.py
++++ sqlalchemy-0.4.7p1/lib/sqlalchemy/orm/mapper.py
+@@ -1583,7 +1583,7 @@ class Mapper(object):
+             if leftcol.table not in needs_tables:
+                 binary.left = sql.bindparam(None, None, type_=binary.right.type)
+                 param_names.append((leftcol, binary.left))
+-            elif rightcol not in needs_tables:
++            elif rightcol.table not in needs_tables:
+                 binary.right = sql.bindparam(None, None, type_=binary.right.type)
+                 param_names.append((rightcol, binary.right))
+ 
+Index: sqlalchemy-0.4.7p1/lib/sqlalchemy/schema.py
+===================================================================
+--- sqlalchemy-0.4.7p1.orig/lib/sqlalchemy/schema.py
++++ sqlalchemy-0.4.7p1/lib/sqlalchemy/schema.py
+@@ -214,7 +214,7 @@ class Table(SchemaItem, expression.Table
+ 
+         self._set_parent(metadata)
+ 
+-	self.__extra_kwargs(**kwargs)
++        self.__extra_kwargs(**kwargs)
+ 
+         # load column definitions from the database if 'autoload' is defined
+         # we do it after the table is in the singleton dictionary to support
+@@ -1036,7 +1036,7 @@ class CheckConstraint(Constraint):
+ 
+         super(CheckConstraint, self).__init__(name, deferrable, initially)
+         if not isinstance(sqltext, basestring):
+-            raise exc.ArgumentError(
++            raise exceptions.ArgumentError(
+                 "sqltext must be a string and will be used verbatim.")
+         self.sqltext = sqltext
+ 

Reply to: