|
From: Oleg B. <no...@so...> - 2015-02-12 14:54:37
|
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 60394d446cc48e95812c6755c4786f50e7a98205 (commit)
from a101ddfff42bc451120529e5bb3d796423abd972 (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/60394d446cc48e95812c6755c4786f50e7a98205
commit 60394d446cc48e95812c6755c4786f50e7a98205
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 12 17:51:33 2015 +0300
Fix #37 flake8 E122 continuation line missing indentation
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index 80cf52f..8d3cf1e 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -73,7 +73,7 @@ class InheritableSelectResults(SelectResults):
parentClause = []
for (currentClass, minParentClass) in tableRegistry.items():
while (currentClass != minParentClass) \
- and currentClass.sqlmeta.parentClass:
+ and currentClass.sqlmeta.parentClass:
parentClass = currentClass.sqlmeta.parentClass
parentClause.append(currentClass.q.id == parentClass.q.id)
currentClass = parentClass
@@ -283,7 +283,7 @@ class InheritableSQLObject(SQLObject):
sqlmeta.parentClass = None
for superclass in cls.__bases__:
if getattr(superclass, '_inheritable', False) \
- and (superclass.__name__ != 'InheritableSQLObject'):
+ and (superclass.__name__ != 'InheritableSQLObject'):
if sqlmeta.parentClass:
# already have a parent class;
# cannot inherit from more than one
@@ -453,7 +453,9 @@ class InheritableSQLObject(SQLObject):
addClause = parentClass.q.childName == cls.sqlmeta.childName
# if the clause was one of TRUE varians, replace it
if (clause is None) or (clause is sqlbuilder.SQLTrueClause) \
- or (isinstance(clause, basestring) and (clause == 'all')):
+ or (
+ isinstance(clause, basestring) and
+ (clause == 'all')):
clause = addClause
else:
# patch WHERE condition:
@@ -470,7 +472,7 @@ class InheritableSQLObject(SQLObject):
elif not isinstance(clause, sqlbuilder.Field):
return None
elif (clause.tableName == clsID.tableName) \
- and (clause.fieldName == clsID.fieldName):
+ and (clause.fieldName == clsID.fieldName):
return parentID
else:
return None
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 2e308ea..d0f5283 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -43,8 +43,8 @@ from .sresults import SelectResults
from .util.threadinglocal import local
import sys
-if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) \
-or ((sys.version_info[0] == 3) and (sys.version_info[:3] < (3, 4, 0))):
+if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) or \
+ ((sys.version_info[0] == 3) and (sys.version_info[:3] < (3, 4, 0))):
raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
if sys.version_info[0] > 2:
diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index d301fb8..78d200e 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -223,7 +223,7 @@ class SQLiteConnection(DBAPI):
except self.module.IntegrityError as e:
msg = ErrorMessage(e)
if msg.startswith('column') and msg.endswith('not unique') \
- or msg.startswith('UNIQUE constraint failed:'):
+ or msg.startswith('UNIQUE constraint failed:'):
raise DuplicateEntryError(msg)
else:
raise IntegrityError(msg)
-----------------------------------------------------------------------
Summary of changes:
sqlobject/inheritance/__init__.py | 10 ++++++----
sqlobject/main.py | 4 ++--
sqlobject/sqlite/sqliteconnection.py | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
