|
From: Oleg B. <no...@so...> - 2015-02-07 23:13:35
|
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 748b6d60cc57aa07baa48dbb4ac17e930a61715a (commit)
via 01fc573a97e58b590519dbdc4d6e6bd0d0eb72a6 (commit)
via 7de150113a1b50d6b8ee66a6cde33237c1b953ec (commit)
via bec0c4adec80590ad097d6c2b3bc726e955da903 (commit)
via a991d3d66d4a021eb88ad1ff982686f3b930d468 (commit)
via 3824b689bc7d35d35d40ef2c52ec47998a34b387 (commit)
from aef770354252bc575c7972ac1a3bf1d199376069 (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/748b6d60cc57aa07baa48dbb4ac17e930a61715a
commit 748b6d60cc57aa07baa48dbb4ac17e930a61715a
Merge: aef7703 01fc573
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 8 02:12:25 2015 +0300
Merge branch 'flake8-fixes'
http://sourceforge.net/p/sqlobject/sqlobject/ci/01fc573a97e58b590519dbdc4d6e6bd0d0eb72a6
commit 01fc573a97e58b590519dbdc4d6e6bd0d0eb72a6
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 8 02:05:39 2015 +0300
Fix #16 flake8 E128
continuation line under-indented for visual indent
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index 840f83b..9d6ff63 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -71,13 +71,13 @@ class TestPeople:
def test_collidingName(self):
raises(AssertionError, Person.sqlmeta.addColumn,
- StringCol(name="name"))
+ StringCol(name="name"))
raises(AssertionError, Person.sqlmeta.addColumn,
- StringCol(name="_init"))
+ StringCol(name="_init"))
raises(AssertionError, Person.sqlmeta.addColumn,
- StringCol(name="expire"))
+ StringCol(name="expire"))
raises(AssertionError, Person.sqlmeta.addColumn,
- StringCol(name="set"))
+ StringCol(name="set"))
raises(AssertionError, self._test_collidingName)
http://sourceforge.net/p/sqlobject/sqlobject/ci/7de150113a1b50d6b8ee66a6cde33237c1b953ec
commit 7de150113a1b50d6b8ee66a6cde33237c1b953ec
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 8 02:03:41 2015 +0300
Fix #22 flake8 E127
continuation line over-indented for visual indent
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
index 226fe2e..2b6f4c5 100644
--- a/sqlobject/maxdb/maxdbconnection.py
+++ b/sqlobject/maxdb/maxdbconnection.py
@@ -66,9 +66,9 @@ class MaxdbConnection(DBAPI):
dbName = 'maxdb'
schemes = [dbName]
- def __init__ (self, host='', port=None, user=None, password=None,
- database=None, autoCommit=1, sqlmode='internal',
- isolation=None, timeout=None, **kw):
+ 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
self.module = dbapi
self.host = host
http://sourceforge.net/p/sqlobject/sqlobject/ci/bec0c4adec80590ad097d6c2b3bc726e955da903
commit bec0c4adec80590ad097d6c2b3bc726e955da903
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 7 21:31:34 2015 +0300
Fix #39 flake8 W291 trailing whitespace
diff --git a/setup.cfg b/setup.cfg
index 370092e..48c67ee 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,10 +20,9 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; F403 'from module import *' used; unable to detect undefined names
; F812 list comprehension redefines 'name' from line 1402
; F822 undefined name in __all__
-; W291 trailing whitespace
; W391 blank line at end of file
; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W291,W391,W603
+ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W391,W603
[pudge]
theme = pythonpaste.org
diff --git a/setup.py b/setup.py
index 86dfe5a..f1f8ee9 100755
--- a/setup.py
+++ b/setup.py
@@ -163,4 +163,4 @@ http://sqlobject.org/docs/News.html
--
Ian Bicking / ia...@co... / http://blog.ianbicking.org
-"""
+""" # noqa: preserve space after two dashes
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 2531dd0..88e3445 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -49,7 +49,7 @@ class MSSQLConnection(DBAPI):
conn_str += "Data Source=%s;Initial Catalog=%s;"
- # MSDE does not allow SQL server login
+ # MSDE does not allow SQL server login
if kw.get("sspi"):
conn_str += \
"Integrated Security=SSPI;Persist Security Info=False"
@@ -219,8 +219,8 @@ class MSSQLConnection(DBAPI):
self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table,
column.dbName))
- # precision and scale is gotten from column table so that we can create
- # decimal columns if needed
+ # Precision and scale is gotten from column table
+ # so that we can create decimal columns if needed.
SHOW_COLUMNS = """
select
name,
diff --git a/sqlobject/tests/test_cyclic_reference.py b/sqlobject/tests/test_cyclic_reference.py
index 4dfd6f7..55f8712 100644
--- a/sqlobject/tests/test_cyclic_reference.py
+++ b/sqlobject/tests/test_cyclic_reference.py
@@ -24,7 +24,7 @@ class TestCyclicReferenceB(SQLObject):
time = DateTimeCol()
short = StringCol(length=10)
blobcol = BLOBCol()
- fkeya = ForeignKey('TestCyclicReferenceA')
+ fkeya = ForeignKey('TestCyclicReferenceA')
def test_cyclic_reference():
diff --git a/sqlobject/versioning/test/test_version.py b/sqlobject/versioning/test/test_version.py
index 56f8766..ca64ce5 100644
--- a/sqlobject/versioning/test/test_version.py
+++ b/sqlobject/versioning/test/test_version.py
@@ -174,11 +174,11 @@ def test_extra():
setup()
extra = Extra(name='title')
extra.name = 'new'
- assert extra.versions[0].extra == 'read all about it'
+ assert extra.versions[0].extra == 'read all about it'
assert sorted(extra.versions[0].getChangedFields()) == ['Name']
def test_altid():
setup()
- extra = HasAltId(name="fleem", altid=5)
+ extra = HasAltId(name="fleem", altid=5)
extra.name = "morx"
http://sourceforge.net/p/sqlobject/sqlobject/ci/a991d3d66d4a021eb88ad1ff982686f3b930d468
commit a991d3d66d4a021eb88ad1ff982686f3b930d468
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 7 21:26:21 2015 +0300
Fix flake8 E302 expected 2 blank lines, found 1
diff --git a/sqlobject/dberrors.py b/sqlobject/dberrors.py
index bd60bd8..2feedbc 100644
--- a/sqlobject/dberrors.py
+++ b/sqlobject/dberrors.py
@@ -9,6 +9,7 @@ import sys
if sys.version_info[0] >= 3:
StandardError = Exception
+
class Error(StandardError):
pass
http://sourceforge.net/p/sqlobject/sqlobject/ci/3824b689bc7d35d35d40ef2c52ec47998a34b387
commit 3824b689bc7d35d35d40ef2c52ec47998a34b387
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 7 18:22:39 2015 +0300
Fix #30 flake8 W293 blank line contains whitespace
diff --git a/setup.cfg b/setup.cfg
index 863e0a5..370092e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,10 +21,9 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; F812 list comprehension redefines 'name' from line 1402
; F822 undefined name in __all__
; W291 trailing whitespace
-; W293 blank line contains whitespace
; W391 blank line at end of file
; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W291,W293,W391,W603
+ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W291,W391,W603
[pudge]
theme = pythonpaste.org
diff --git a/sqlobject/cache.py b/sqlobject/cache.py
index 690b137..111b5a3 100644
--- a/sqlobject/cache.py
+++ b/sqlobject/cache.py
@@ -374,4 +374,3 @@ class CacheSet(object):
return self.caches[cls.__name__].getAll()
else:
return []
-
diff --git a/sqlobject/dberrors.py b/sqlobject/dberrors.py
index 986c80d..bd60bd8 100644
--- a/sqlobject/dberrors.py
+++ b/sqlobject/dberrors.py
@@ -1,7 +1,7 @@
"""dberrors: database exception classes for SQLObject.
These classes are dictated by the DB API v2.0:
-
+
http://www.python.org/topics/database/DatabaseAPI-2.0.html
"""
diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index 14b2fea..a093f77 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -268,7 +268,7 @@ def supports(feature):
"The supportMatrix does not list this feature: %r"
% feature)
-
+
# To avoid name clashes:
_inserts = inserts
diff --git a/sqlobject/tests/test_combining_joins.py b/sqlobject/tests/test_combining_joins.py
index 3423ec2..690570e 100644
--- a/sqlobject/tests/test_combining_joins.py
+++ b/sqlobject/tests/test_combining_joins.py
@@ -38,10 +38,10 @@ def test_join_sqlrepr():
u2.complexes.add(c2)
u2.complexes.add(c3)
assert list(Complex.selectBy(name='c1')) == [c1]
-
+
assert list(cg1.unit_models) == [u1]
assert list(cg2.unit_models) == [u1, u2, u2]
assert list(cg2.unit_models.distinct()) == [u1, u2]
-
+
assert list(
cg2.unit_models.filter(UnitModel.q.name == 'u1')) == [u1]
diff --git a/sqlobject/tests/test_paste.py b/sqlobject/tests/test_paste.py
index 8c52dee..98e4ac5 100644
--- a/sqlobject/tests/test_paste.py
+++ b/sqlobject/tests/test_paste.py
@@ -90,4 +90,3 @@ def test_other():
setup()
assert runapp(use_transaction=True)
assert names() == ['app1', 'app2']
-
diff --git a/sqlobject/tests/test_sqlbuilder_dbspecific.py b/sqlobject/tests/test_sqlbuilder_dbspecific.py
index 08768cf..029b72b 100644
--- a/sqlobject/tests/test_sqlbuilder_dbspecific.py
+++ b/sqlobject/tests/test_sqlbuilder_dbspecific.py
@@ -41,14 +41,14 @@ def testMiscOps():
setupClass(SBButton)
yield checkCount, AND(makeClause(), makeClause()), 2
yield checkCount, AND(makeClause(), EXISTS(makeSelect())), 2
-
-
+
+
def testAliased():
setupClass(SBButton)
b = Alias(makeSelect(), 'b')
yield checkCount, b, 1
yield checkCount, Select(b.q.id), 1
-
+
# Table1 & Table2 are treated individually in joins
yield checkCount, JOIN(None, b), 1
yield checkCount, JOIN(b, SBButton), 1
@@ -56,10 +56,9 @@ def testAliased():
yield checkCount, LEFTJOINOn(None, b, SBButton.q.id == b.q.id), 1
yield checkCount, LEFTJOINOn(b, SBButton, SBButton.q.id == b.q.id), 1
yield checkCount, LEFTJOINOn(SBButton, b, SBButton.q.id == b.q.id), 1
-
-
+
+
def testTablesUsedSResults():
setupClass(SBButton)
-
+
yield checkCount, SBButton.select(makeClause()).queryForSelect(), 1
-
diff --git a/sqlobject/util/csvimport.py b/sqlobject/util/csvimport.py
index fe7b2cb..247a9f2 100644
--- a/sqlobject/util/csvimport.py
+++ b/sqlobject/util/csvimport.py
@@ -10,7 +10,7 @@ Supported types:
A python expression, run through ``eval()``. This can be a
security risk, pass in ``allow_python=False`` if you don't want to
allow it.
-
+
``:int``:
Integer
@@ -137,7 +137,7 @@ def create_data(data, class_getter, keyorder=None):
else:
objects[name] = inst
return objects
-
+
def load_csv_from_directory(directory,
allow_python=True, default_type=DEFAULT_TYPE,
@@ -175,7 +175,7 @@ def load_csv(csvreader, allow_python=True, default_type=DEFAULT_TYPE,
current_class = default_class
current_headers = None
results = {}
-
+
for row in csvreader:
if not [cell for cell in row if cell.strip()]:
# empty row
@@ -336,7 +336,7 @@ def parse_datetime(v):
else:
parsed = time.strptime(v, fmts[-1])
return datetime.fromtimestamp(time.mktime(parsed))
-
+
register_coercer('datetime', parse_datetime)
diff --git a/sqlobject/views.py b/sqlobject/views.py
index 862b8dd..6193b77 100644
--- a/sqlobject/views.py
+++ b/sqlobject/views.py
@@ -44,7 +44,7 @@ class ViewSQLObject(SQLObject):
See test_views.py for simple examples.
"""
-
+
def __classinit__(cls, new_attrs):
SQLObject.__classinit__(cls, new_attrs)
# like is_base
diff --git a/sqlobject/wsgi_middleware.py b/sqlobject/wsgi_middleware.py
index 5a605aa..b1395ae 100644
--- a/sqlobject/wsgi_middleware.py
+++ b/sqlobject/wsgi_middleware.py
@@ -18,11 +18,11 @@ def make_middleware(app, global_conf, database=None, use_transaction=False,
``sqlobject.get_connection()``:
Returns the connection object
-
+
``sqlobject.abort()``:
Aborts the transaction. Does not raise an error, but at the *end*
of the request there will be a rollback.
-
+
``sqlobject.begin()``:
Starts a transaction. First commits (or rolls back if aborted) if
this is run in a transaction.
@@ -102,4 +102,3 @@ class SQLObjectMiddleware(object):
environ['sqlobject.in_transaction'] = in_transaction
return catch_errors(self.app, environ, start_response,
error_callback=error, ok_callback=ok)
-
-----------------------------------------------------------------------
Summary of changes:
setup.cfg | 5 ++---
setup.py | 2 +-
sqlobject/cache.py | 1 -
sqlobject/dberrors.py | 3 ++-
sqlobject/maxdb/maxdbconnection.py | 4 ++--
sqlobject/mssql/mssqlconnection.py | 6 +++---
sqlobject/tests/dbtest.py | 2 +-
sqlobject/tests/test_auto.py | 8 ++++----
sqlobject/tests/test_combining_joins.py | 4 ++--
sqlobject/tests/test_cyclic_reference.py | 2 +-
sqlobject/tests/test_paste.py | 1 -
sqlobject/tests/test_sqlbuilder_dbspecific.py | 13 ++++++-------
sqlobject/util/csvimport.py | 8 ++++----
sqlobject/versioning/test/test_version.py | 4 ++--
sqlobject/views.py | 2 +-
sqlobject/wsgi_middleware.py | 5 ++---
16 files changed, 33 insertions(+), 37 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
