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 bb333927311676fc023ec54938be81a2ee7e0d03 (commit)
via dbbdc86fb22854682d8e1a94ae0154e558903028 (commit)
via 753903081500d91fe246e0286089758ef3de0c31 (commit)
via 49b63d9d3ad7cb82d7b31e86257e2af49dbce240 (commit)
from 0b9ad6e9a3927353359f32ab50181217a2f0a4d8 (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/bb333927311676fc023ec54938be81a2ee7e0d03
commit bb333927311676fc023ec54938be81a2ee7e0d03
Merge: 7539030 dbbdc86
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 6 20:03:54 2015 +0300
Merge pull request #65 from drnlm/issue_47_flak8_E211
Issue 47: Fix E211 - whitespace before (
http://sourceforge.net/p/sqlobject/sqlobject/ci/dbbdc86fb22854682d8e1a94ae0154e558903028
commit dbbdc86fb22854682d8e1a94ae0154e558903028
Author: Neil <ne...@di...>
Date: Fri Feb 6 18:59:34 2015 +0200
Fix E211 - whitespace before (
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index b8961f9..74ca35a 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -330,8 +330,8 @@ class FirebirdConnection(DBAPI):
# can look like: "DEFAULT 0", "DEFAULT 'default text'", None
if defaultSource:
defaultSource = defaultSource.split(' ')[1]
- if defaultSource.startswith ("'") and \
- defaultSource.endswith ("'"):
+ if defaultSource.startswith("'") and \
+ defaultSource.endswith("'"):
defaultSource = str(defaultSource[1:-1])
elif fieldType in ("integer", "smallint", "bigint"):
defaultSource = int(defaultSource)
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
index 16aa43a..4ebe143 100644
--- a/sqlobject/maxdb/maxdbconnection.py
+++ b/sqlobject/maxdb/maxdbconnection.py
@@ -66,7 +66,7 @@ class MaxdbConnection(DBAPI):
dbName = 'maxdb'
schemes = [dbName]
- def __init__ (self, host='', port=None, user=None, password=None,
+ def __init__(self, host='', port=None, user=None, password=None,
database=None, autoCommit=1, sqlmode='internal',
isolation=None, timeout=None, **kw):
from sapdb import dbapi
diff --git a/sqlobject/versioning/__init__.py b/sqlobject/versioning/__init__.py
index 2e937d3..512aa8c 100644
--- a/sqlobject/versioning/__init__.py
+++ b/sqlobject/versioning/__init__.py
@@ -80,7 +80,7 @@ class Versioning(object):
'extraCols': self.extraCols
}
- getColumns (attrs, self.soClass)
+ getColumns(attrs, self.soClass)
attrs.update(self.extraCols)
http://sourceforge.net/p/sqlobject/sqlobject/ci/753903081500d91fe246e0286089758ef3de0c31
commit 753903081500d91fe246e0286089758ef3de0c31
Merge: 0b9ad6e 49b63d9
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 6 18:03:17 2015 +0300
Merge pull request #64 from drnlm/issue_51_flake8_E222
Issue #51: Fix flake8 E222 - multiple spaces after operator
http://sourceforge.net/p/sqlobject/sqlobject/ci/49b63d9d3ad7cb82d7b31e86257e2af49dbce240
commit 49b63d9d3ad7cb82d7b31e86257e2af49dbce240
Author: Neil <ne...@di...>
Date: Fri Feb 6 12:13:49 2015 +0200
Fix flake8 E222 - multiple spaces after operator
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index ecf0c54..b8961f9 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -123,7 +123,7 @@ class FirebirdConnection(DBAPI):
"""Firebird slaps the limit and offset (actually 'first' and
'skip', respectively) statement right after the select."""
if not start:
- limit_str = "SELECT FIRST %i" % end
+ limit_str = "SELECT FIRST %i" % end
if not end:
limit_str = "SELECT SKIP %i" % start
else:
@@ -182,7 +182,7 @@ class FirebirdConnection(DBAPI):
def readDefaultEncodingFromDB(self):
# Get out if encoding is known allready (can by None as well).
if self.defaultDbEncoding == "":
- self.defaultDbEncoding = str(self.queryOne(
+ self.defaultDbEncoding = str(self.queryOne(
"SELECT rdb$character_set_name FROM rdb$database")[0].\
strip().lower()) # encoding defined during db creation
if self.defaultDbEncoding == "none":
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index 7e3b1b8..d59e41f 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -529,7 +529,7 @@ class SQLObjectTableWithJoins(SQLObjectTable):
return SQLObjectTable.__getattr__(self, attr)
def _getattrFromForeignKey(self, column, attr):
- ret = getattr(self, column.name) == \
+ ret = getattr(self, column.name) == \
getattr(self.soClass, '_SO_class_'+column.foreignKey).q.id
return ret
-----------------------------------------------------------------------
Summary of changes:
sqlobject/firebird/firebirdconnection.py | 8 ++++----
sqlobject/maxdb/maxdbconnection.py | 2 +-
sqlobject/sqlbuilder.py | 2 +-
sqlobject/versioning/__init__.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
SQLObject development repository
|