|
From: Oleg B. <no...@so...> - 2015-02-15 22:24:19
|
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 fb15acc6f07eb639a4dd2be03f080ade895994da (commit)
from 3c762203f2dfb80df26876ec06a5ddb3efa11620 (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/fb15acc6f07eb639a4dd2be03f080ade895994da
commit fb15acc6f07eb639a4dd2be03f080ade895994da
Author: Oleg Broytman <ph...@ph...>
Date: Mon Feb 16 01:21:38 2015 +0300
Fix flake8 W503 line break before binary operator
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 54b9ac2..19e14d7 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -618,8 +618,9 @@ class DBAPI(DBConnection):
def _SO_selectOneAlt(self, so, columnNames, condition):
if columnNames:
- columns = [isinstance(x, basestring) and sqlbuilder.SQLConstant(x)
- or x for x in columnNames]
+ columns = [isinstance(x, basestring) and
+ sqlbuilder.SQLConstant(x) or
+ x for x in columnNames]
else:
columns = None
return self.queryOne(self.sqlrepr(sqlbuilder.Select(
@@ -1040,8 +1041,8 @@ class ConnectionURIOpener(object):
def registerConnectionInstance(self, inst):
if inst.name:
- assert (inst.name not in self.instanceNames
- or self.instanceNames[inst.name] is cls # noqa
+ assert (inst.name not in self.instanceNames or
+ self.instanceNames[inst.name] is cls # noqa
), ("A instance has already been registered "
"with the name %s" % inst.name)
assert inst.name.find(':') == -1, \
diff --git a/sqlobject/declarative.py b/sqlobject/declarative.py
index bc3485a..9d25445 100644
--- a/sqlobject/declarative.py
+++ b/sqlobject/declarative.py
@@ -197,8 +197,8 @@ class Declarative(object):
@staticmethod
def _repr_vars(dictNames):
names = [n for n in dictNames
- if not n.startswith('_')
- and n != 'declarative_count']
+ if not n.startswith('_') and
+ n != 'declarative_count']
names.sort()
return names
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index 403e4b5..17ae613 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -420,18 +420,18 @@ class SOManyToMany(object):
self.otherClass, events.CreateTableSignal)
self.clause = (
(self.otherClass.q.id ==
- sqlbuilder.Field(self.intermediateTable, self.otherColumn))
- & (sqlbuilder.Field(self.intermediateTable, self.joinColumn)
- == self.soClass.q.id))
+ sqlbuilder.Field(self.intermediateTable, self.otherColumn)) &
+ (sqlbuilder.Field(self.intermediateTable, self.joinColumn) ==
+ self.soClass.q.id))
def __get__(self, obj, type):
if obj is None:
return self
query = (
(self.otherClass.q.id ==
- sqlbuilder.Field(self.intermediateTable, self.otherColumn))
- & (sqlbuilder.Field(self.intermediateTable, self.joinColumn)
- == obj.id))
+ sqlbuilder.Field(self.intermediateTable, self.otherColumn)) &
+ (sqlbuilder.Field(self.intermediateTable, self.joinColumn) ==
+ obj.id))
select = self.otherClass.select(query)
return _ManyToManySelectWrapper(obj, self, select)
@@ -524,15 +524,15 @@ class SOOneToMany(object):
self.joinColumn = styles.getStyle(
self.soClass).tableReference(self.soClass.sqlmeta.table)
self.clause = (
- sqlbuilder.Field(self.otherClass.sqlmeta.table, self.joinColumn)
- == self.soClass.q.id)
+ sqlbuilder.Field(self.otherClass.sqlmeta.table, self.joinColumn) ==
+ self.soClass.q.id)
def __get__(self, obj, type):
if obj is None:
return self
query = (
- sqlbuilder.Field(self.otherClass.sqlmeta.table, self.joinColumn)
- == obj.id)
+ sqlbuilder.Field(self.otherClass.sqlmeta.table, self.joinColumn) ==
+ obj.id)
select = self.otherClass.select(query)
return _OneToManySelectWrapper(obj, self, select)
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 52d9363..f0174e4 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -440,8 +440,8 @@ class Command(object):
for section in p.sections():
name = section.strip().lower()
if (conf_section == name or
- (conf_section == name.split(':')[-1]
- and name.split(':')[0] in ('app', 'application'))):
+ (conf_section == name.split(':')[-1] and
+ name.split(':')[0] in ('app', 'application'))):
possible_sections.append(section)
if not possible_sections:
@@ -966,8 +966,7 @@ class CommandRecord(Command):
dbName = cls._connection.dbName
if cls._connection not in conns:
conns.append(cls._connection)
- fn = os.path.join(cls.__name__
- + '_' + dbName + '.sql')
+ fn = os.path.join(cls.__name__ + '_' + dbName + '.sql')
if sim:
continue
create, constraints = cls.createTableSQL()
@@ -1058,8 +1057,8 @@ class CommandRecord(Command):
print("Cannot edit upgrader because there is no "
"previous version")
else:
- breaker = ('-' * 20 + ' lines below this will be ignored '
- + '-' * 20)
+ breaker = ('-' * 20 + ' lines below this will be ignored ' +
+ '-' * 20)
pre_text = breaker + '\n' + '\n'.join(all_diffs)
text = self.open_editor('\n\n' + pre_text, breaker=breaker,
extension='.sql')
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index fd3e0dd..5660606 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -213,8 +213,8 @@ class SelectResults(object):
""" Counting elements of current select results """
assert not self.ops.get('start') and not self.ops.get('end'), \
"start/end/limit have no meaning with 'count'"
- assert not (self.ops.get('distinct') and (self.ops.get('start')
- or self.ops.get('end'))), \
+ assert not (self.ops.get('distinct') and
+ (self.ops.get('start') or self.ops.get('end'))), \
"distinct-counting of sliced objects is not supported"
if self.ops.get('distinct'):
# Column must be specified, so we are using unique ID column.
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index a00f8fb..c6d5fec 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -47,8 +47,8 @@ class TestPeople:
nickname = StringCol('nickname', length=10)
Person.sqlmeta.addColumn(nickname, changeSchema=True)
Person(name='robert', nickname='bob')
- assert ([p.name for p in Person.select('all')]
- == ['bob', 'jake', 'jane', 'robert', 'tim'])
+ assert ([p.name for p in Person.select('all')] ==
+ ['bob', 'jake', 'jane', 'robert', 'tim'])
Person.sqlmeta.delColumn(nickname, changeSchema=True)
def test_dynamicJoin(self):
diff --git a/sqlobject/tests/test_joins.py b/sqlobject/tests/test_joins.py
index 63fa306..c570b2f 100644
--- a/sqlobject/tests/test_joins.py
+++ b/sqlobject/tests/test_joins.py
@@ -110,8 +110,8 @@ class TestJoin2:
def test_defaultOrder(self):
p1 = PersonJoiner2.byName('bob')
- assert ([i.zip for i in p1.addressJoiner2s]
- == ['33333', '22222', '11111'])
+ assert ([i.zip for i in p1.addressJoiner2s] ==
+ ['33333', '22222', '11111'])
_personJoiner3_getters = []
diff --git a/sqlobject/tests/test_new_joins.py b/sqlobject/tests/test_new_joins.py
index 10f108d..c325eb7 100644
--- a/sqlobject/tests/test_new_joins.py
+++ b/sqlobject/tests/test_new_joins.py
@@ -116,8 +116,8 @@ class TestJoin2:
def test_defaultOrder(self):
p1 = PersonJoinerNew2.byName('bob')
- assert ([i.zip for i in p1.addressJoiner2s]
- == ['33333', '22222', '11111'])
+ assert ([i.zip for i in p1.addressJoiner2s] ==
+ ['33333', '22222', '11111'])
_personJoiner3_getters = []
diff --git a/sqlobject/tests/test_transactions.py b/sqlobject/tests/test_transactions.py
index 171d5ee..124ff8b 100644
--- a/sqlobject/tests/test_transactions.py
+++ b/sqlobject/tests/test_transactions.py
@@ -26,8 +26,8 @@ def test_transaction():
TestSOTrans(name='joe', connection=trans)
trans.rollback()
trans.begin()
- assert ([n.name for n in TestSOTrans.select(connection=trans)]
- == ['bob', 'tim'])
+ assert ([n.name for n in TestSOTrans.select(connection=trans)] ==
+ ['bob', 'tim'])
b = TestSOTrans.byName('bob', connection=trans)
b.name = 'robert'
trans.commit()
diff --git a/sqlobject/util/csvimport.py b/sqlobject/util/csvimport.py
index 79ef985..ba0fa0d 100644
--- a/sqlobject/util/csvimport.py
+++ b/sqlobject/util/csvimport.py
@@ -88,8 +88,8 @@ def create_data(data, class_getter, keyorder=None):
"""
objects = {}
classnames = data.keys()
- if (not keyorder and isinstance(class_getter, types.ModuleType)
- and hasattr(class_getter, 'soClasses')):
+ if (not keyorder and isinstance(class_getter, types.ModuleType) and
+ hasattr(class_getter, 'soClasses')):
keyorder = [c.__name__ for c in class_getter.soClasses]
if not keyorder:
classnames.sort()
@@ -117,8 +117,7 @@ def create_data(data, class_getter, keyorder=None):
raise ValueError(
"Object reference to %r does not have target"
% value.name)
- elif (isinstance(resolved, list)
- and len(resolved) > 1):
+ elif (isinstance(resolved, list) and len(resolved) > 1):
raise ValueError(
"Object reference to %r is ambiguous (got %r)"
% (value.name, resolved))
-----------------------------------------------------------------------
Summary of changes:
sqlobject/dbconnection.py | 9 +++++----
sqlobject/declarative.py | 4 ++--
sqlobject/joins.py | 20 ++++++++++----------
sqlobject/manager/command.py | 11 +++++------
sqlobject/sresults.py | 4 ++--
sqlobject/tests/test_auto.py | 4 ++--
sqlobject/tests/test_joins.py | 4 ++--
sqlobject/tests/test_new_joins.py | 4 ++--
sqlobject/tests/test_transactions.py | 4 ++--
sqlobject/util/csvimport.py | 7 +++----
10 files changed, 35 insertions(+), 36 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
