|
From: Oleg B. <no...@so...> - 2015-02-09 14:07:46
|
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 272211a770b325c20197b187478a4781d61955fc (commit)
from 41f1d8dcd07fd73386aa4fa1f44aae9f1ff9b1e5 (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/272211a770b325c20197b187478a4781d61955fc
commit 272211a770b325c20197b187478a4781d61955fc
Author: Oleg Broytman <ph...@ph...>
Date: Mon Feb 9 17:06:39 2015 +0300
Fix #25 flake8 E502 backslash is redundant between brackets
diff --git a/setup.cfg b/setup.cfg
index 48c67ee..4bae483 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,14 +15,13 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; E124 closing bracket does not match visual indentation
; E226 missing whitespace around arithmetic operator
; E401 multiple imports on one line
-; E502 the backslash is redundant between brackets
; F402 import 'name' shadowed by loop variable
; F403 'from module import *' used; unable to detect undefined names
; F812 list comprehension redefines 'name' from line 1402
; F822 undefined name in __all__
; W391 blank line at end of file
; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W391,W603
+ignore = E123,E124,E226,E401,F402,F403,F812,F822,W391,W603
[pudge]
theme = pythonpaste.org
diff --git a/setup.py b/setup.py
index f1f8ee9..9045300 100755
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@ and `GitHub <https://github.com/sqlobject>`_.
download_url="https://pypi.python.org/pypi/SQLObject/"
"%sdev-2014" % version,
license="LGPL",
- packages=["sqlobject"] + \
+ packages=["sqlobject"] +
['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
package_data={"sqlobject":
diff --git a/sqlobject/converters.py b/sqlobject/converters.py
index efae0c5..35cfcdc 100644
--- a/sqlobject/converters.py
+++ b/sqlobject/converters.py
@@ -208,7 +208,7 @@ def sqlrepr(obj, db=None):
except AttributeError:
converter = lookupConverter(obj)
if converter is None:
- raise ValueError("Unknown SQL builtin type: %s for %s" % \
+ raise ValueError("Unknown SQL builtin type: %s for %s" %
(type(obj), repr(obj)))
return converter(obj, db)
else:
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index ded823f..c51e226 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -542,11 +542,10 @@ class DBAPI(DBConnection):
return constraints
def createReferenceConstraints(self, soClass):
- refConstraints = [self.createReferenceConstraint(soClass, column) \
- for column in soClass.sqlmeta.columnList \
+ refConstraints = [self.createReferenceConstraint(soClass, column)
+ for column in soClass.sqlmeta.columnList
if isinstance(column, col.SOForeignKey)]
- refConstraintDefs = [constraint \
- for constraint in refConstraints \
+ refConstraintDefs = [constraint for constraint in refConstraints
if constraint]
return refConstraintDefs
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index 74ca35a..284330c 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -136,7 +136,7 @@ class FirebirdConnection(DBAPI):
return query
def createTable(self, soClass):
- self.query('CREATE TABLE %s (\n%s\n)' % \
+ self.query('CREATE TABLE %s (\n%s\n)' %
(soClass.sqlmeta.table, self.createColumns(soClass)))
self.query("CREATE GENERATOR GEN_%s" % soClass.sqlmeta.table)
return []
@@ -183,7 +183,7 @@ class FirebirdConnection(DBAPI):
# Get out if encoding is known allready (can by None as well).
if self.defaultDbEncoding == "":
self.defaultDbEncoding = str(self.queryOne(
- "SELECT rdb$character_set_name FROM rdb$database")[0].\
+ "SELECT rdb$character_set_name FROM rdb$database")[0].
strip().lower()) # encoding defined during db creation
if self.defaultDbEncoding == "none":
self.defaultDbEncoding = None
@@ -433,8 +433,9 @@ class FirebirdConnection(DBAPI):
return col.Col, {}
def createEmptyDatabase(self):
- self.module.create_database("CREATE DATABASE '%s' user '%s' password '%s'" % \
- (self.db, self.user, self.password))
+ self.module.create_database(
+ "CREATE DATABASE '%s' user '%s' password '%s'" %
+ (self.db, self.user, self.password))
def dropDatabase(self):
self.module.drop_database()
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index 3303aff..ee2ef16 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -359,7 +359,7 @@ class SOSingleJoin(SOMultipleJoin):
if not self.makeDefault:
return None
else:
- kw = {self.soClass.sqlmeta.style.\
+ kw = {self.soClass.sqlmeta.style.
instanceIDAttrToAttr(pythonColumn): inst}
# instanciating the otherClass with all
return self.otherClass(**kw)
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 9ca364c..f09aff0 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -1229,7 +1229,7 @@ class SQLObject(object):
def _SO_getValue(self, name):
# Retrieves a single value from the database. Simple.
assert not self.sqlmeta._obsolete, (
- "%s with id %s has become obsolete" \
+ "%s with id %s has become obsolete"
% (self.__class__.__name__, self.id))
# @@: do we really need this lock?
# self._SO_writeLock.acquire()
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
index 7b59943..b388b1c 100644
--- a/sqlobject/maxdb/maxdbconnection.py
+++ b/sqlobject/maxdb/maxdbconnection.py
@@ -173,7 +173,7 @@ class MaxdbConnection(DBAPI):
# self.createSequenceName(soClass.sqlmeta.table))
# t.commit()
# so use transaction when the problem will be solved
- self.query('CREATE TABLE %s (\n%s\n)' % \
+ self.query('CREATE TABLE %s (\n%s\n)' %
(soClass.sqlmeta.table, self.createColumns(soClass)))
self.query("CREATE SEQUENCE %s"
% self.createSequenceName(soClass.sqlmeta.table))
diff --git a/sqlobject/tests/test_sqlbuilder_joins_instances.py b/sqlobject/tests/test_sqlbuilder_joins_instances.py
index 1747f66..e1c56f2 100644
--- a/sqlobject/tests/test_sqlbuilder_joins_instances.py
+++ b/sqlobject/tests/test_sqlbuilder_joins_instances.py
@@ -79,7 +79,7 @@ def testJoin2():
list(SBAddress.select(
AND(SBPerson.q.id == SBAddress.q.personID,
SBPerson.q.name == 'Julia')).orderBy(SBAddress.q.city)) == \
- list(SBPerson.selectBy(name='Julia').throughTo.\
+ list(SBPerson.selectBy(name='Julia').throughTo.
addresses.orderBy(SBAddress.q.city))
-----------------------------------------------------------------------
Summary of changes:
setup.cfg | 3 +--
setup.py | 2 +-
sqlobject/converters.py | 2 +-
sqlobject/dbconnection.py | 7 +++----
sqlobject/firebird/firebirdconnection.py | 9 +++++----
sqlobject/joins.py | 2 +-
sqlobject/main.py | 2 +-
sqlobject/maxdb/maxdbconnection.py | 2 +-
sqlobject/tests/test_sqlbuilder_joins_instances.py | 2 +-
9 files changed, 15 insertions(+), 16 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
