|
From: Oleg B. <no...@so...> - 2015-02-01 13:48:17
|
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 4c186a80866582e7bf035cc55e28a5c2fd71b81d (commit)
via 70294b7c584a3500bf6c8d63b234b4249a8f69e1 (commit)
via 0d2f3d1b14aeb087aceb72dc4b208fcbd210c772 (commit)
via dc59b33729e3a81e35d342b73ae70ede8448c376 (commit)
via d7ce0b146564a7292114bfdeb93c2c306076fe3b (commit)
from d4d62c29687742c98ea32116f28beb19bd485be6 (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/4c186a80866582e7bf035cc55e28a5c2fd71b81d
commit 4c186a80866582e7bf035cc55e28a5c2fd71b81d
Merge: d4d62c2 70294b7
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 1 16:47:29 2015 +0300
Merge branch 'flake8-fixes'
http://sourceforge.net/p/sqlobject/sqlobject/ci/70294b7c584a3500bf6c8d63b234b4249a8f69e1
commit 70294b7c584a3500bf6c8d63b234b4249a8f69e1
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 1 16:46:16 2015 +0300
Fix #28 flake8 E202 whitespace before ')'
diff --git a/sqlobject/include/hashcol.py b/sqlobject/include/hashcol.py
index f4a2aa2..8043aa7 100644
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@ -8,60 +8,60 @@ class DbHash:
""" Presents a comparison object for hashes, allowing plain text to be
automagically compared with the base content. """
- def __init__(self, hash, hashMethod ):
+ def __init__(self, hash, hashMethod):
self.hash = hash
self.hashMethod = hashMethod
- def __cmp__(self, other ):
+ def __cmp__(self, other):
if other is None:
if self.hash is None:
return 0
return True
- if not isinstance(other, basestring ):
+ if not isinstance(other, basestring):
raise TypeError(
"A hash may only be compared with a string, or None.")
- return cmp(self.hashMethod(other ), self.hash )
+ return cmp(self.hashMethod(other), self.hash)
- def __repr__(self ):
+ def __repr__(self):
return "<DbHash>"
-class HashValidator(sqlobject.col.StringValidator ):
+class HashValidator(sqlobject.col.StringValidator):
""" Provides formal SQLObject validation services for the HashCol. """
- def to_python(self, value, state ):
+ def to_python(self, value, state):
""" Passes out a hash object. """
if value is None:
return None
- return DbHash(hash = value, hashMethod = self.hashMethod )
+ return DbHash(hash = value, hashMethod = self.hashMethod)
- def from_python(self, value, state ):
+ def from_python(self, value, state):
""" Store the given value as a MD5 hash, or None if specified. """
if value is None:
return None
- return self.hashMethod(value )
+ return self.hashMethod(value)
-class SOHashCol(sqlobject.col.SOStringCol ):
+class SOHashCol(sqlobject.col.SOStringCol):
""" The internal HashCol definition. By default, enforces a md5 digest. """
- def __init__(self, **kw ):
+ def __init__(self, **kw):
if 'hashMethod' not in kw:
from hashlib import md5
- self.hashMethod = lambda v: md5(v ).hexdigest()
+ self.hashMethod = lambda v: md5(v).hexdigest()
if 'length' not in kw:
kw['length'] = 32
else:
self.hashMethod = kw['hashMethod']
del kw['hashMethod']
- super(sqlobject.col.SOStringCol, self ).__init__(**kw )
+ super(sqlobject.col.SOStringCol, self).__init__(**kw)
- def createValidators(self ):
- return [HashValidator(name=self.name, hashMethod=self.hashMethod )] + \
- super(SOHashCol, self ).createValidators()
+ def createValidators(self):
+ return [HashValidator(name=self.name, hashMethod=self.hashMethod)] + \
+ super(SOHashCol, self).createValidators()
-class HashCol(sqlobject.col.StringCol ):
+class HashCol(sqlobject.col.StringCol):
""" End-user HashCol class. May be instantiated with 'hashMethod', a function
which returns the string hash of any other string (i.e. basestring). """
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 76d7b76..8608f04 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -149,7 +149,7 @@ class MSSQLConnection(DBAPI):
values = [id] + values
elif has_identity and idName in names:
try:
- i = names.index(idName )
+ i = names.index(idName)
if i:
del names[i]
del values[i]
http://sourceforge.net/p/sqlobject/sqlobject/ci/0d2f3d1b14aeb087aceb72dc4b208fcbd210c772
commit 0d2f3d1b14aeb087aceb72dc4b208fcbd210c772
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 1 16:43:59 2015 +0300
Fix #29 flake8 E201 whitespace after '('
diff --git a/sqlobject/include/hashcol.py b/sqlobject/include/hashcol.py
index 6a80374..f4a2aa2 100644
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@ -8,60 +8,60 @@ class DbHash:
""" Presents a comparison object for hashes, allowing plain text to be
automagically compared with the base content. """
- def __init__( self, hash, hashMethod ):
+ def __init__(self, hash, hashMethod ):
self.hash = hash
self.hashMethod = hashMethod
- def __cmp__( self, other ):
+ def __cmp__(self, other ):
if other is None:
if self.hash is None:
return 0
return True
- if not isinstance( other, basestring ):
+ if not isinstance(other, basestring ):
raise TypeError(
"A hash may only be compared with a string, or None.")
- return cmp( self.hashMethod( other ), self.hash )
+ return cmp(self.hashMethod(other ), self.hash )
- def __repr__( self ):
+ def __repr__(self ):
return "<DbHash>"
-class HashValidator( sqlobject.col.StringValidator ):
+class HashValidator(sqlobject.col.StringValidator ):
""" Provides formal SQLObject validation services for the HashCol. """
- def to_python( self, value, state ):
+ def to_python(self, value, state ):
""" Passes out a hash object. """
if value is None:
return None
- return DbHash( hash = value, hashMethod = self.hashMethod )
+ return DbHash(hash = value, hashMethod = self.hashMethod )
- def from_python( self, value, state ):
+ def from_python(self, value, state ):
""" Store the given value as a MD5 hash, or None if specified. """
if value is None:
return None
- return self.hashMethod( value )
+ return self.hashMethod(value )
-class SOHashCol( sqlobject.col.SOStringCol ):
+class SOHashCol(sqlobject.col.SOStringCol ):
""" The internal HashCol definition. By default, enforces a md5 digest. """
- def __init__( self, **kw ):
+ def __init__(self, **kw ):
if 'hashMethod' not in kw:
from hashlib import md5
- self.hashMethod = lambda v: md5( v ).hexdigest()
+ self.hashMethod = lambda v: md5(v ).hexdigest()
if 'length' not in kw:
kw['length'] = 32
else:
self.hashMethod = kw['hashMethod']
del kw['hashMethod']
- super( sqlobject.col.SOStringCol, self ).__init__( **kw )
+ super(sqlobject.col.SOStringCol, self ).__init__(**kw )
- def createValidators( self ):
- return [HashValidator( name=self.name, hashMethod=self.hashMethod )] + \
- super( SOHashCol, self ).createValidators()
+ def createValidators(self ):
+ return [HashValidator(name=self.name, hashMethod=self.hashMethod )] + \
+ super(SOHashCol, self ).createValidators()
-class HashCol( sqlobject.col.StringCol ):
+class HashCol(sqlobject.col.StringCol ):
""" End-user HashCol class. May be instantiated with 'hashMethod', a function
which returns the string hash of any other string (i.e. basestring). """
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index cfbdec3..76d7b76 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -149,7 +149,7 @@ class MSSQLConnection(DBAPI):
values = [id] + values
elif has_identity and idName in names:
try:
- i = names.index( idName )
+ i = names.index(idName )
if i:
del names[i]
del values[i]
http://sourceforge.net/p/sqlobject/sqlobject/ci/dc59b33729e3a81e35d342b73ae70ede8448c376
commit dc59b33729e3a81e35d342b73ae70ede8448c376
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 31 20:05:29 2015 +0300
Fix #24 flake8 E221 multiple spaces before operator
diff --git a/setup.cfg b/setup.cfg
index c957a12..069a010 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,6 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; Ignore:
; E123 closing bracket does not match indentation of opening bracket's line
; E124 closing bracket does not match visual indentation
-; E221 multiple spaces before operator
; E226 missing whitespace around arithmetic operator
; E401 multiple imports on one line
; E502 the backslash is redundant between brackets
@@ -26,7 +25,7 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; W293 blank line contains whitespace
; W391 blank line at end of file
; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E221,E226,E401,E502,F402,F403,F812,F821,F822,W291,W293,W391,W603
+ignore = E123,E124,E226,E401,E502,F402,F403,F812,F821,F822,W291,W293,W391,W603
[pudge]
theme = pythonpaste.org
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index a388dcf..d992f6c 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
version = '3.0'
-major = 3
-minor = 0
-micro = 0
+major = 3
+minor = 0
+micro = 0
release_level = 'trunk'
-serial = 0
+serial = 0
version_info = (major, minor, micro, release_level, serial)
diff --git a/sqlobject/col.py b/sqlobject/col.py
index cd262a9..5128eeb 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -999,7 +999,7 @@ class SOForeignKey(SOKeyCol):
# to the id of the reference table
sql = ' '.join([fidName, self._maxdbType()])
tName = other.sqlmeta.table
- idName = self.refColumn or other.sqlmeta.idName
+ idName = self.refColumn or other.sqlmeta.idName
sql = sql + ',' + '\n'
sql = sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)' % (fidName, tName,
idName)
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index 56a23a4..ecf0c54 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -185,7 +185,7 @@ class FirebirdConnection(DBAPI):
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":
+ if self.defaultDbEncoding == "none":
self.defaultDbEncoding = None
if self.dbEncoding != self.defaultDbEncoding:
warningText = """\n
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index 5bc9cae..a586ded 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -183,7 +183,7 @@ class InheritableSQLMeta(sqlmeta):
if sqlmeta.parentClass:
for join in sqlmeta.parentClass.sqlmeta.joins:
jname = join.joinMethodName
- jarn = join.addRemoveName
+ jarn = join.addRemoveName
setattr(
soClass, getterName(jname),
eval('lambda self: self._parent.%s' % jname))
diff --git a/sqlobject/inheritance/tests/test_indexes.py b/sqlobject/inheritance/tests/test_indexes.py
index 687d1f8..f2b393b 100644
--- a/sqlobject/inheritance/tests/test_indexes.py
+++ b/sqlobject/inheritance/tests/test_indexes.py
@@ -4,21 +4,21 @@ from sqlobject.inheritance import InheritableSQLObject
class InheritedPersonIndexGet(InheritableSQLObject):
- first_name = StringCol(notNone=True, length=100)
- last_name = StringCol(notNone=True, length=100)
- age = IntCol()
- pk = DatabaseIndex(first_name, last_name, unique=True)
+ first_name = StringCol(notNone=True, length=100)
+ last_name = StringCol(notNone=True, length=100)
+ age = IntCol()
+ pk = DatabaseIndex(first_name, last_name, unique=True)
class InheritedEmployeeIndexGet(InheritedPersonIndexGet):
security_number = IntCol()
- experience = IntCol()
- sec_index = DatabaseIndex(security_number, unique=True)
+ experience = IntCol()
+ sec_index = DatabaseIndex(security_number, unique=True)
class InheritedSalesManIndexGet(InheritedEmployeeIndexGet):
_inheritable = False
- skill = IntCol()
+ skill = IntCol()
def test_index_get_1():
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
index 4e70e75..01ce60b 100644
--- a/sqlobject/maxdb/maxdbconnection.py
+++ b/sqlobject/maxdb/maxdbconnection.py
@@ -69,15 +69,15 @@ class MaxdbConnection(DBAPI):
isolation=None, timeout=None, **kw):
from sapdb import dbapi
self.module = dbapi
- self.host = host
- self.port = port
- self.user = user
- self.password = password
- self.db = database
+ self.host = host
+ self.port = port
+ self.user = user
+ self.password = password
+ self.db = database
self.autoCommit = autoCommit
- self.sqlmode = sqlmode
+ self.sqlmode = sqlmode
self.isolation = isolation
- self.timeout = timeout
+ self.timeout = timeout
DBAPI.__init__(self, **kw)
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index 4b59bc8..583e821 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -669,7 +669,7 @@ class Select(SQLExpression):
self.ops['having'] = having
self.ops['orderBy'] = orderBy
self.ops['limit'] = limit
- self.ops['join'] = join
+ self.ops['join'] = join
self.ops['lazyColumns'] = lazyColumns
self.ops['distinct'] = distinct
self.ops['distinctOn'] = distinctOn
diff --git a/sqlobject/tests/test_indexes.py b/sqlobject/tests/test_indexes.py
index fbf4717..5b2277e 100644
--- a/sqlobject/tests/test_indexes.py
+++ b/sqlobject/tests/test_indexes.py
@@ -75,16 +75,16 @@ def test_index_get_1():
class PersonIndexGet2(SQLObject):
- name = StringCol(alternateID=True, length=100)
- age = IntCol()
- addresses = MultipleJoin('AddressIndexGet2')
+ name = StringCol(alternateID=True, length=100)
+ age = IntCol()
+ addresses = MultipleJoin('AddressIndexGet2')
class AddressIndexGet2(SQLObject):
- person = ForeignKey('PersonIndexGet2', notNone=True)
- type = StringCol(notNone=True, length=100)
- street = StringCol(notNone=True)
- pk = DatabaseIndex(person, type, unique=True)
+ person = ForeignKey('PersonIndexGet2', notNone=True)
+ type = StringCol(notNone=True, length=100)
+ street = StringCol(notNone=True)
+ pk = DatabaseIndex(person, type, unique=True)
def test_index_get_2():
diff --git a/sqlobject/tests/test_select_through.py b/sqlobject/tests/test_select_through.py
index 4a91627..f70a5b1 100644
--- a/sqlobject/tests/test_select_through.py
+++ b/sqlobject/tests/test_select_through.py
@@ -9,7 +9,7 @@ import py
class SRThrough1(SQLObject):
three = ForeignKey('SRThrough3')
- twos = SQLMultipleJoin('SRThrough2', joinColumn='oneID')
+ twos = SQLMultipleJoin('SRThrough2', joinColumn='oneID')
class SRThrough2(SQLObject):
@@ -37,8 +37,8 @@ def setup_module(mod):
twos[0].addThree(threes[0])
twos[0].addThree(threes[1])
mod.threes = threes
- mod.twos = twos
- mod.ones = ones
+ mod.twos = twos
+ mod.ones = ones
def testBadRef():
diff --git a/sqlobject/views.py b/sqlobject/views.py
index b203e0b..862b8dd 100644
--- a/sqlobject/views.py
+++ b/sqlobject/views.py
@@ -78,7 +78,7 @@ class ViewSQLObject(SQLObject):
else:
columns.append(ascol)
- metajoin = getattr(cls.sqlmeta, 'join', NoDefault)
+ metajoin = getattr(cls.sqlmeta, 'join', NoDefault)
clause = getattr(cls.sqlmeta, 'clause', NoDefault)
select = Select(columns,
distinct=True,
http://sourceforge.net/p/sqlobject/sqlobject/ci/d7ce0b146564a7292114bfdeb93c2c306076fe3b
commit d7ce0b146564a7292114bfdeb93c2c306076fe3b
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 31 02:31:30 2015 +0300
Fix #26 flake8 E126 continuation line over-indented
diff --git a/setup.cfg b/setup.cfg
index 82f72a1..c957a12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,6 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; Ignore:
; E123 closing bracket does not match indentation of opening bracket's line
; E124 closing bracket does not match visual indentation
-; E126 continuation line over-indented for hanging indent
; E221 multiple spaces before operator
; E226 missing whitespace around arithmetic operator
; E401 multiple imports on one line
@@ -27,7 +26,7 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; W293 blank line contains whitespace
; W391 blank line at end of file
; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E126,E221,E226,E401,E502,F402,F403,F812,F821,F822,W291,W293,W391,W603
+ignore = E123,E124,E221,E226,E401,E502,F402,F403,F812,F821,F822,W291,W293,W391,W603
[pudge]
theme = pythonpaste.org
diff --git a/setup.py b/setup.py
index bcb4e8f..86dfe5a 100755
--- a/setup.py
+++ b/setup.py
@@ -62,19 +62,19 @@ and `GitHub <https://github.com/sqlobject>`_.
:target: https://travis-ci.org/sqlobject/sqlobject
""",
classifiers=[
- "Development Status :: 2 - Pre-Alpha",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: "
- "GNU Library or Lesser General Public License (LGPL)",
- "Programming Language :: Python",
- "Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.6",
... 387 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
