[SQL-CVS] SQLObject development repository branch master updated. 2.1.0-197-g430a2fe

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  430a2fe7344f2a4a9e9741c96abfb77fc7cfe5a3 (commit)
       via  6a745636b95344ae6978b522c5de0c6b8aadcabc (commit)
       via  7a7216eb77aebaf6aac6567ac723285a90535c50 (commit)
      from  46d0d0ae10564e7970afef57813b2e7a3a44b39a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/430a2fe7344f2a4a9e9741c96abfb77fc7cfe5a3

commit 430a2fe7344f2a4a9e9741c96abfb77fc7cfe5a3
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Feb 15 23:20:58 2015 +0300

    Fix #33 flake8 F402 import 'name' shadowed by loop variable

diff --git a/sqlobject/versioning/__init__.py b/sqlobject/versioning/__init__.py
index eda26cb..dd7566f 100644
--- a/sqlobject/versioning/__init__.py
+++ b/sqlobject/versioning/__init__.py
@@ -1,5 +1,4 @@
 from datetime import datetime
-
 from sqlobject import col, events, SQLObject, AND
 
 
@@ -9,8 +8,8 @@ class Version(SQLObject):
         del values['id']
         del values['masterID']
         del values['dateArchived']
-        for col in self.extraCols:
-            del values[col]
+        for _col in self.extraCols:
+            del values[_col]
         self.masterClass.get(self.masterID).set(**values)
 
     def nextVersion(self):

http://sourceforge.net/p/sqlobject/sqlobject/ci/6a745636b95344ae6978b522c5de0c6b8aadcabc

commit 6a745636b95344ae6978b522c5de0c6b8aadcabc
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Feb 15 23:19:14 2015 +0300

    Fix #12 flake8 E501 line too long

diff --git a/sqlobject/tests/test_sorting.py b/sqlobject/tests/test_sorting.py
index 49b6eab..10626fc 100644
--- a/sqlobject/tests/test_sorting.py
+++ b/sqlobject/tests/test_sorting.py
@@ -75,5 +75,6 @@ def test_singleUntranslatedColumnOrder():
         ['zoe', 'tim', 'joe', 'joe', 'aj']
     assert firstList(Names.select().orderBy(Names.q.firstName).reversed()) == \
         ['zoe', 'tim', 'joe', 'joe', 'aj']
-    assert firstList(Names.select().orderBy(DESC(Names.q.firstName)).reversed()) == \
+    assert firstList(
+        Names.select().orderBy(DESC(Names.q.firstName)).reversed()) == \
         ['aj', 'joe', 'joe', 'tim', 'zoe']
diff --git a/sqlobject/tests/test_sqlite.py b/sqlobject/tests/test_sqlite.py
index ea5c3f5..ac2de71 100644
--- a/sqlobject/tests/test_sqlite.py
+++ b/sqlobject/tests/test_sqlite.py
@@ -94,7 +94,8 @@ def test_sqlite_aggregate():
 
     SQLiteFactoryTest(name='sqlobject')
     SQLiteFactoryTest(name='sqlbuilder')
-    assert SQLiteFactoryTest.select(orderBy="name").accumulateOne("group_concat", "name") == \
+    assert SQLiteFactoryTest.select(orderBy="name").\
+        accumulateOne("group_concat", "name") == \
         "sqlbuilder, sqlobject"
 
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/7a7216eb77aebaf6aac6567ac723285a90535c50

commit 7a7216eb77aebaf6aac6567ac723285a90535c50
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Feb 15 23:16:40 2015 +0300

    Fix flake8 E731 do not assign a lambda expression, use a def

diff --git a/sqlobject/main.py b/sqlobject/main.py
index 7d56464..ad9160f 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -846,7 +846,8 @@ class SQLObject(object):
         for i in implicitIndexes:
             sqlmeta.addIndex(i)
 
-        order_getter = lambda o: o.creationOrder
+        def order_getter(o):
+            return o.creationOrder
         sqlmeta.columnList.sort(key=order_getter)
         sqlmeta.indexes.sort(key=order_getter)
         sqlmeta.indexDefinitions.sort(key=order_getter)
@@ -1129,9 +1130,14 @@ class SQLObject(object):
         # Filter out items that don't map to column names.
         # Those will be set directly on the object using
         # setattr(obj, name, value).
-        is_column = lambda _c: _c in self.sqlmeta._plainSetters
-        f_is_column = lambda item: is_column(item[0])
-        f_not_column = lambda item: not is_column(item[0])
+        def is_column(_c):
+            return _c in self.sqlmeta._plainSetters
+
+        def f_is_column(item):
+            return is_column(item[0])
+
+        def f_not_column(item):
+            return not is_column(item[0])
         items = kw.items()
         extra = dict(filter(f_not_column, items))
         kw = dict(filter(f_is_column, items))
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index 2beadc9..de028e0 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -798,7 +798,8 @@ class Select(SQLExpression):
             if self.ops['reversed']:
                 reverser = DESC
             else:
-                reverser = lambda x: x
+                def reverser(x):
+                    return x
             if isinstance(orderBy, (list, tuple)):
                 select += " ORDER BY %s" % ", ".join(
                     [_str_or_sqlrepr(reverser(_x), db) for _x in orderBy])

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/main.py                |   14 ++++++++++----
 sqlobject/sqlbuilder.py          |    3 ++-
 sqlobject/tests/test_sorting.py  |    3 ++-
 sqlobject/tests/test_sqlite.py   |    3 ++-
 sqlobject/versioning/__init__.py |    5 ++---
 5 files changed, 18 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
SQLObject development repository