|
From: Oleg B. <no...@so...> - 2015-02-07 12:02:36
|
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 aef770354252bc575c7972ac1a3bf1d199376069 (commit)
via de8725ee3c5dcb879e5c1bee632dc0d8a3ba09be (commit)
via 08779bbf61cd9153f4c8b619a6dd415ce6098f7c (commit)
via aac5b4e900aaf10eb8544a158cafce9ebfa77ca3 (commit)
from 57d02341d725820da1574fbdcc58c5b173cbf3c9 (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/aef770354252bc575c7972ac1a3bf1d199376069
commit aef770354252bc575c7972ac1a3bf1d199376069
Merge: de8725e 08779bb
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 7 14:59:10 2015 +0300
Merge pull request #68 from drnlm/issue_34_flake8_E303
Issue #34: Fix flake8 E303 - Too many blank lines
http://sourceforge.net/p/sqlobject/sqlobject/ci/de8725ee3c5dcb879e5c1bee632dc0d8a3ba09be
commit de8725ee3c5dcb879e5c1bee632dc0d8a3ba09be
Merge: 57d0234 aac5b4e
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 7 14:56:48 2015 +0300
Merge pull request #67 from drnlm/fix_test_md5
Tweak test_md5 to be compatible with python 3
http://sourceforge.net/p/sqlobject/sqlobject/ci/08779bbf61cd9153f4c8b619a6dd415ce6098f7c
commit 08779bbf61cd9153f4c8b619a6dd415ce6098f7c
Author: Neil <ne...@di...>
Date: Sat Feb 7 08:56:39 2015 +0200
Fix flake8 E303 - Too many blank lines
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 1295691..6bcfb43 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -621,7 +621,6 @@ class DBAPI(DBConnection):
def _SO_selectOne(self, so, columnNames):
return self._SO_selectOneAlt(so, columnNames, so.q.id == so.id)
-
def _SO_selectOneAlt(self, so, columnNames, condition):
if columnNames:
columns = [isinstance(x, basestring) and sqlbuilder.SQLConstant(x)
diff --git a/sqlobject/inheritance/tests/test_foreignKey.py b/sqlobject/inheritance/tests/test_foreignKey.py
index 49f19cd..92104f7 100644
--- a/sqlobject/inheritance/tests/test_foreignKey.py
+++ b/sqlobject/inheritance/tests/test_foreignKey.py
@@ -34,7 +34,6 @@ def test_foreignKey():
EmployeeWithNotes(firstName='Senior', lastName='Clerk', paper=paper)
PersonWithNotes(firstName='Some', lastName='Person')
-
person = PersonWithNotes.get(1)
assert isinstance(person, PersonWithNotes) and \
not isinstance(person, EmployeeWithNotes)
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index 02280a0..3303aff 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -227,7 +227,6 @@ class SORelatedJoin(SOMultipleJoin):
self.otherColumn = self.soClass.sqlmeta.style.tableReference(
otherClass.sqlmeta.table)
-
def hasIntermediateTable(self):
return True
@@ -372,7 +371,6 @@ class SingleJoin(Join):
baseClass = SOSingleJoin
-
from . import boundattributes
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 6dbde14..e206b33 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -1743,7 +1743,6 @@ class SQLObject(object):
def tablesUsedImmediate(self):
return [self.__class__.q]
-
# Comparison
def __eq__(self, other):
@@ -1767,7 +1766,6 @@ class SQLObject(object):
def __ge__(self, other):
return NotImplemented
-
# (De)serialization (pickle, etc.)
def __getstate__(self):
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index c310af7..27b57fe 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -1229,7 +1229,6 @@ class CommandUpgrade(CommandRecord):
self.update_db(next_version, conn)
print('Done.')
-
def current_version(self):
conn = self.connection()
if not conn.tableExists(SQLObjectVersionTable.sqlmeta.table):
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index 924c7e5..ce02f93 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -151,7 +151,6 @@ class SelectResults(object):
return list(self)[value.start:]
return list(self)[:value.stop]
-
if value.start:
assert value.start >= 0
start = self.ops.get('start', 0) + value.start
diff --git a/sqlobject/tests/test_sqlbuilder_joins_instances.py b/sqlobject/tests/test_sqlbuilder_joins_instances.py
index d96ae5b..1747f66 100644
--- a/sqlobject/tests/test_sqlbuilder_joins_instances.py
+++ b/sqlobject/tests/test_sqlbuilder_joins_instances.py
@@ -39,7 +39,6 @@ def testJoin():
SBAddress.q.city == 'London'))) == \
list(SBAddress.selectBy(city='London').throughTo.person)
-
assert list(SBAddress.select(
AND(SBPerson.q.id == SBAddress.q.personID,
SBPerson.q.name == 'Julia')).orderBy(SBAddress.q.city)) == \
diff --git a/sqlobject/versioning/test/test_version.py b/sqlobject/versioning/test/test_version.py
index c8a7d60..0ab1ec2 100644
--- a/sqlobject/versioning/test/test_version.py
+++ b/sqlobject/versioning/test/test_version.py
@@ -97,7 +97,6 @@ def test_inheritable_versioning():
child.set(name='teenager', toy='guitar')
assert len(list(child.versions)) == 0
-
# child versioned, base unversioned
government = Government(name='canada')
assert not hasattr(government, 'versions')
http://sourceforge.net/p/sqlobject/sqlobject/ci/aac5b4e900aaf10eb8544a158cafce9ebfa77ca3
commit aac5b4e900aaf10eb8544a158cafce9ebfa77ca3
Author: Neil <ne...@di...>
Date: Fri Feb 6 11:46:02 2015 +0200
Tweak test_md5 to be compatible with python 3
diff --git a/sqlobject/tests/test_md5.py b/sqlobject/tests/test_md5.py
index 128fc6b..ca01368 100644
--- a/sqlobject/tests/test_md5.py
+++ b/sqlobject/tests/test_md5.py
@@ -7,7 +7,7 @@ from hashlib import md5
def test_md5():
- assert md5('').hexdigest() == 'd41d8cd98f00b204e9800998ecf8427e'
- assert md5('\n').hexdigest() == '68b329da9893e34099c7d8ad5cb9c940'
- assert md5('123').hexdigest() == '202cb962ac59075b964b07152d234b70'
- assert md5('123\n').hexdigest() == 'ba1f2511fc30423bdbb183fe33f3dd0f'
+ assert md5(b'').hexdigest() == 'd41d8cd98f00b204e9800998ecf8427e'
+ assert md5(b'\n').hexdigest() == '68b329da9893e34099c7d8ad5cb9c940'
+ assert md5(b'123').hexdigest() == '202cb962ac59075b964b07152d234b70'
+ assert md5(b'123\n').hexdigest() == 'ba1f2511fc30423bdbb183fe33f3dd0f'
-----------------------------------------------------------------------
Summary of changes:
sqlobject/dbconnection.py | 1 -
sqlobject/inheritance/tests/test_foreignKey.py | 1 -
sqlobject/joins.py | 2 --
sqlobject/main.py | 2 --
sqlobject/manager/command.py | 1 -
sqlobject/sresults.py | 1 -
sqlobject/tests/test_md5.py | 8 ++++----
sqlobject/tests/test_sqlbuilder_joins_instances.py | 1 -
sqlobject/versioning/test/test_version.py | 1 -
9 files changed, 4 insertions(+), 14 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
