|
From: Oleg B. <no...@so...> - 2015-02-06 14:28:18
|
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 0b9ad6e9a3927353359f32ab50181217a2f0a4d8 (commit)
via da0798a2199fd08871788a1e594ceaf2c1a6a7da (commit)
via 1f3a349f3dfe8bdd17ae230d613c44cff71e5bed (commit)
via 08fbca575502ceb57833abba595c160acaa86802 (commit)
via f4f7d7906ceb86950b39369a14da04f62c9cb95c (commit)
via dccae4721f2e5897d6f0ca822e6177f66d2e7884 (commit)
from b5a0d7d34e83c613984c7aff39c12ffbaeba2e70 (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/0b9ad6e9a3927353359f32ab50181217a2f0a4d8
commit 0b9ad6e9a3927353359f32ab50181217a2f0a4d8
Merge: da0798a 1f3a349
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 6 17:26:31 2015 +0300
Merge pull request #63 from drnlm/issue_3_Operator_syntax_fixes
Issue 3 operator syntax fixes
http://sourceforge.net/p/sqlobject/sqlobject/ci/da0798a2199fd08871788a1e594ceaf2c1a6a7da
commit da0798a2199fd08871788a1e594ceaf2c1a6a7da
Merge: b5a0d7d dccae47
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 6 17:25:42 2015 +0300
Merge pull request #62 from drnlm/issue_46_flake8_E271
Fix flake8 E271 - multiple spaces after keyword
http://sourceforge.net/p/sqlobject/sqlobject/ci/1f3a349f3dfe8bdd17ae230d613c44cff71e5bed
commit 1f3a349f3dfe8bdd17ae230d613c44cff71e5bed
Author: Neil <ne...@di...>
Date: Fri Feb 6 11:34:47 2015 +0200
No reason to suppress W603 anymore
diff --git a/setup.cfg b/setup.cfg
index 863e0a5..ec4b034 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,8 +23,7 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; 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,W293,W391
[pudge]
theme = pythonpaste.org
http://sourceforge.net/p/sqlobject/sqlobject/ci/08fbca575502ceb57833abba595c160acaa86802
commit 08fbca575502ceb57833abba595c160acaa86802
Author: Neil <ne...@di...>
Date: Fri Feb 6 11:34:10 2015 +0200
Update docs to use '!=' instead of '<>'
diff --git a/docs/SQLBuilder.txt b/docs/SQLBuilder.txt
index 4aaf45b..d3e7c83 100644
--- a/docs/SQLBuilder.txt
+++ b/docs/SQLBuilder.txt
@@ -34,7 +34,7 @@ field. All of this is probably easier to grasp in an example::
person.first_name = 'John'
>>> name = 'John'
>>> person.first_name != name
- person.first_name <> 'John'
+ person.first_name != 'John'
>>> AND(person.first_name == 'John', person.last_name == 'Doe')
(person.first_name = 'John' AND person.last_name = 'Doe')
diff --git a/docs/SQLObject.txt b/docs/SQLObject.txt
index 92f78b9..42663e9 100644
--- a/docs/SQLObject.txt
+++ b/docs/SQLObject.txt
@@ -1219,13 +1219,13 @@ different types of columns, when SQLObject creates your tables.
limitations on using UnicodeCol in queries:
- only simple q-magic fields are supported; no expressions;
- - only == and <> operators are supported;
+ - only == and != operators are supported;
The following code works::
MyTable.select(u'value' == MyTable.q.name)
- MyTable.select(MyTable.q.name <> u'value')
- MyTable.select(OR(MyTable.q.col1 == u'value1', MyTable.q.col2 <> u'value2'))
+ MyTable.select(MyTable.q.name != u'value')
+ MyTable.select(OR(MyTable.q.col1 == u'value1', MyTable.q.col2 != u'value2'))
MyTable.selectBy(name = u'value')
MyTable.selectBy(col1=u'value1', col2=u'value2')
MyTable.byCol1(u'value1') # if col1 is an alternateID
http://sourceforge.net/p/sqlobject/sqlobject/ci/f4f7d7906ceb86950b39369a14da04f62c9cb95c
commit f4f7d7906ceb86950b39369a14da04f62c9cb95c
Author: Neil <ne...@di...>
Date: Fri Feb 6 11:32:48 2015 +0200
Avoid '<>' in tests, due to python3 syntax changes
diff --git a/sqlobject/inheritance/tests/test_foreignKey.py b/sqlobject/inheritance/tests/test_foreignKey.py
index ce71846..49f19cd 100644
--- a/sqlobject/inheritance/tests/test_foreignKey.py
+++ b/sqlobject/inheritance/tests/test_foreignKey.py
@@ -45,13 +45,13 @@ def test_foreignKey():
assert employee.note.text == "employee"
save_employee = employee
- persons = PersonWithNotes.select(PersonWithNotes.q.noteID <> None)
+ persons = PersonWithNotes.select(PersonWithNotes.q.noteID != None)
assert persons.count() == 2
persons = PersonWithNotes.selectBy(noteID=person.note.id)
assert persons.count() == 1
- employee = EmployeeWithNotes.select(PersonWithNotes.q.noteID <> None)
+ employee = EmployeeWithNotes.select(PersonWithNotes.q.noteID != None)
assert employee.count() == 1
persons = PersonWithNotes.selectBy(noteID=person.note.id)
diff --git a/sqlobject/inheritance/tests/test_inheritance.py b/sqlobject/inheritance/tests/test_inheritance.py
index 83ec676..a504d9f 100644
--- a/sqlobject/inheritance/tests/test_inheritance.py
+++ b/sqlobject/inheritance/tests/test_inheritance.py
@@ -50,19 +50,19 @@ def test_inheritance():
def test_inheritance_select():
setup()
- persons = InheritablePerson.select(InheritablePerson.q.firstName <> None)
+ persons = InheritablePerson.select(InheritablePerson.q.firstName != None)
assert persons.count() == 2
persons = InheritablePerson.select(InheritablePerson.q.firstName == "phd")
assert persons.count() == 0
- employees = Employee.select(Employee.q.firstName <> None)
+ employees = Employee.select(Employee.q.firstName != None)
assert employees.count() == 1
employees = Employee.select(Employee.q.firstName == "phd")
assert employees.count() == 0
- employees = Employee.select(Employee.q.position <> None)
+ employees = Employee.select(Employee.q.position != None)
assert employees.count() == 1
persons = InheritablePerson.selectBy(firstName="Project")
diff --git a/sqlobject/tests/test_comparison.py b/sqlobject/tests/test_comparison.py
index 2da35fe..ba0693e 100644
--- a/sqlobject/tests/test_comparison.py
+++ b/sqlobject/tests/test_comparison.py
@@ -21,4 +21,4 @@ def test_eq():
assert t2 is not t4
assert t1 == t3
assert t2 == t4
- assert t1 <> t2
+ assert t1 != t2
http://sourceforge.net/p/sqlobject/sqlobject/ci/dccae4721f2e5897d6f0ca822e6177f66d2e7884
commit dccae4721f2e5897d6f0ca822e6177f66d2e7884
Author: Neil <ne...@di...>
Date: Fri Feb 6 12:10:03 2015 +0200
Fix flake8 E271 - multiple spaces after keyword
diff --git a/sqlobject/col.py b/sqlobject/col.py
index fee0b14..cc8558c 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -1388,7 +1388,7 @@ class SODateCol(SOCol):
return 'DATE'
def _maxdbType(self):
- return 'DATE'
+ return 'DATE'
def _sqliteType(self):
return 'DATE'
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 20e1585..6dbde14 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -341,7 +341,7 @@ class sqlmeta(object):
if hasattr(base, "sqlmeta"):
parent_columns.extend(base.sqlmeta.columns.keys())
if hasattr(soClass, name):
- assert (name in parent_columns) or (name == "childName"), (
+ assert (name in parent_columns) or (name == "childName"), (
"The class %s.%s already has a variable or method %r, "
"you cannot add the column %r" % (
soClass.__module__, soClass.__name__, name, name))
diff --git a/sqlobject/versioning/__init__.py b/sqlobject/versioning/__init__.py
index 61cffb1..2e937d3 100644
--- a/sqlobject/versioning/__init__.py
+++ b/sqlobject/versioning/__init__.py
@@ -88,7 +88,7 @@ class Versioning(object):
(Version,),
attrs)
- if '_connection' in self.soClass.__dict__:
+ if '_connection' in self.soClass.__dict__:
self.versionClass._connection = \
self.soClass.__dict__['_connection']
-----------------------------------------------------------------------
Summary of changes:
docs/SQLBuilder.txt | 2 +-
docs/SQLObject.txt | 6 +++---
setup.cfg | 3 +--
sqlobject/col.py | 2 +-
sqlobject/inheritance/tests/test_foreignKey.py | 4 ++--
sqlobject/inheritance/tests/test_inheritance.py | 6 +++---
sqlobject/main.py | 2 +-
sqlobject/tests/test_comparison.py | 2 +-
sqlobject/versioning/__init__.py | 2 +-
9 files changed, 14 insertions(+), 15 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
