From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 2 Feb 2010 01:18:11 +0000 (+0000)
Subject: merge r6703 of trunk fixes [ticket:1661]
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=570b4ac485ed19a92cc48bd0ad3629b36367ee81;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge r6703 of trunk fixes [ticket:1661]
---

diff --git a/CHANGES b/CHANGES
index 98063d9c1b..55ac86349b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,12 @@
 =======
 CHANGES
 =======
-
+0.5.9
+=====
+- sql
+    - Fixed erroneous self_group() call in expression package.
+      [ticket:1661]
+      
 0.5.9
 =====
 - firebird
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index c9ef37c8b7..5a47c4e1eb 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2382,7 +2382,7 @@ class _UnaryExpression(ColumnElement):
         else:
             return super(_UnaryExpression, self)._negate()
 
-    def self_group(self, against):
+    def self_group(self, against=None):
         if self.operator and operators.is_precedent(self.operator, against):
             return _Grouping(self)
         else: