(no commit message)

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 5a5a922256e2d055c9bea5ee415cef2ceba1d4ca..2d9d26e9510a2ff9ef0ae0a474323c946cdd8a35 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -270,11 +270,10 @@ class Join(Selectable):
         self.left = left
         self.right = right
         self.id = self.left.id + "_" + self.right.id
-
         if allcols:
             self.columns = [c for c in self.left.columns] + [c for c in self.right.columns]
         else:
-            self.columns = [c for c in self.right.columns]    
+            self.columns = [c for c in self.right.columns]
 
         # TODO: if no onclause, do NATURAL JOIN
         self.onclause = onclause

diff --git a/test/select.py b/test/select.py
index 796806c9cd587e02e939c5da49f2a12a10ef32c1..6bdf43167f8a57bf194c0499134fced794f18cce 100644 (file)
--- a/test/select.py
+++ b/test/select.py
@@ -195,7 +195,7 @@ FROM mytable, myothertable WHERE foo.id = foofoo(lala) AND datetime(foo) = Today
         ), 
         "SELECT t.myid, t.name, t.description, foo.f FROM mytable t, (select f from bar where lala=heyhey) foo WHERE foo.f = t.id")
 
-    def  testjoin(self):
+    def testjoin(self):
         self.runtest(
             join(self.table2, self.table, self.table.c.id == self.table2.c.id).select(),
             "SELECT myothertable.otherid, myothertable.othername, mytable.myid, mytable.name, mytable.description \