|
From: Oleg B. <no...@so...> - 2015-01-20 20:56:19
|
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 1711dd6a30542d836254f8045f2ffdff61b44947 (commit)
via 4b27e7a8884c4a9060b1fbf655e926b100976135 (commit)
via e20eb5580d60fc7fb6611fc828e50ff3facc3384 (commit)
via 42356bd06f13d161e6e1c1aedacc064b13d9e4a5 (commit)
via d9258bfd300af2343389dca94017561db6c72a2f (commit)
via 82fbef11cf975ed2cba518afbbc57e23f65fe6ba (commit)
via 051e1c969930009e0b3e634cd2fbf90526a0627d (commit)
via f67843a69941a12962bbef4acb35d5e431740118 (commit)
via 4554be711062c346ea161cb74271d0abd2843ecf (commit)
via 17a6f70b21cb194d5e15cbe88421f48ad4cd69b1 (commit)
via a19132ea7b132dbc5ceb60d221c5e0e11c7206c1 (commit)
via c74a965c183ddd193e3040ebb660a4ac19f9a039 (commit)
via c728128ff3387fbf78f42f64d9985d117ec7c9fd (commit)
via 524a742996f7efffb5f8cf00d062283f4473e6b7 (commit)
via b1de2edcee3bbf17c8b8927cb36a72a7e92ac42a (commit)
via 6720c05b668e88f75601d136560e414bc3009ced (commit)
via dcf5a9fd11dc18d187c6fb5170712f3f829b9491 (commit)
via dc1f5b4a5f91d5e327ab54f0e8b5ba2c8caf2191 (commit)
via 5fd2cc1d1b3b301a3cb4d6146acc5f9c07bf33ad (commit)
via 7974c0ce8b08cbbcac6e872a8e8c9b4ad1419925 (commit)
via d4374a6696bbfeb45aa6e772350c4f067197ba4f (commit)
via da164e0b4f5b6905a4484cba3b2bd11fa5218326 (commit)
via d19da7986a204d72c3845d08735308fc0dad3718 (commit)
via e91a3f3a7750f92f85874db120cfd44f1295563c (commit)
via abfb5ed80c67df511477e17b9e031403dd806149 (commit)
via c5b51ced08b1b66059ceab7c94ce120dfb376981 (commit)
via 223c4deb29df12b49b3dfddd5dc3eef2a99a45f0 (commit)
via 84a2aa1187cf7a9ec7593920d9ad0708b7d28f55 (commit)
from 30d92f73c22087bd69e58b44153912dea1eadd25 (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/1711dd6a30542d836254f8045f2ffdff61b44947
commit 1711dd6a30542d836254f8045f2ffdff61b44947
Merge: 30d92f7 4b27e7a
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 20 23:54:47 2015 +0300
Merge branch 'flake8-fixes'
http://sourceforge.net/p/sqlobject/sqlobject/ci/4b27e7a8884c4a9060b1fbf655e926b100976135
commit 4b27e7a8884c4a9060b1fbf655e926b100976135
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 20 23:54:08 2015 +0300
Fix #12 flake8 E501 line too long
diff --git a/setup.cfg b/setup.cfg
index 1e37b25..f59c08a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,10 +18,9 @@ exclude = .git,docs/europython/*.py,ez_setup.py
; E226 missing whitespace around arithmetic operator
; E302 expected 2 blank lines, found <n>
; E401 multiple imports on one line
-; E501 line too long (168 > 79 characters)
; E502 the backslash is redundant between brackets
; E701 multiple statements on one line (colon)
-ignore = E123,E124,E126,E221,E226,E302,E401,E501,E502,E701,F
+ignore = E123,E124,E126,E221,E226,E302,E401,E502,E701,F
[pudge]
theme = pythonpaste.org
diff --git a/setup.py b/setup.py
index e7fffb3..bcb4e8f 100755
--- a/setup.py
+++ b/setup.py
@@ -62,27 +62,30 @@ 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",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.4",
- "Topic :: Database",
- "Topic :: Database :: Front-Ends",
- "Topic :: Software Development :: Libraries :: Python Modules",
- ],
+ "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",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.4",
+ "Topic :: Database",
+ "Topic :: Database :: Front-Ends",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ ],
author="Ian Bicking",
author_email="ia...@co...",
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
url="http://sqlobject.org/devel/",
- download_url="https://pypi.python.org/pypi/SQLObject/%sdev-2014" % version,
+ download_url="https://pypi.python.org/pypi/SQLObject/"
+ "%sdev-2014" % version,
license="LGPL",
- packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
+ packages=["sqlobject"] + \
+ ['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
package_data={"sqlobject": [
"../docs/LICENSE", "../docs/*.txt", "../docs/*.css",
diff --git a/sqlobject/classregistry.py b/sqlobject/classregistry.py
index 374c0b0..7681718 100644
--- a/sqlobject/classregistry.py
+++ b/sqlobject/classregistry.py
@@ -58,7 +58,8 @@ class ClassRegistry(object):
if className in self.classes:
callback(self.classes[className], *args, **kw)
else:
- self.callbacks.setdefault(className, []).append((callback, args, kw))
+ self.callbacks.setdefault(className, []).append(
+ (callback, args, kw))
def addCallback(self, callback, *args, **kw):
"""
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 0232d6b..6b3911f 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -43,7 +43,9 @@ try:
from mx import DateTime
except ImportError:
try:
- import DateTime # old version of mxDateTime, or Zope's Version if we're running with Zope
+ # old version of mxDateTime,
+ # or Zope's Version if we're running with Zope
+ import DateTime
except ImportError:
mxdatetime_available = False
else:
@@ -118,9 +120,13 @@ class SOCol(object):
# @@: I suppose we could actually add backquotes to the
# dbName if we needed to...
if not forceDBName:
- assert sqlbuilder.sqlIdentifier(name), 'Name must be SQL-safe (letters, numbers, underscores): %s (or use forceDBName=True)' \
- % repr(name)
- assert name != 'id', 'The column name "id" is reserved for SQLObject use (and is implicitly created).'
+ assert sqlbuilder.sqlIdentifier(name), (
+ 'Name must be SQL-safe '
+ '(letters, numbers, underscores): %s (or use forceDBName=True)'
+ % repr(name))
+ assert name != 'id', (
+ 'The column name "id" is reserved for SQLObject use '
+ '(and is implicitly created).')
assert name, "You must provide a name for all columns"
self.columnDef = columnDef
@@ -135,7 +141,8 @@ class SOCol(object):
# 'null': a SET NULL trigger is generated
if isinstance(cascade, str):
assert cascade == 'null', (
- "The only string value allowed for cascade is 'null' (you gave: %r)" % cascade)
+ "The only string value allowed for cascade is 'null' "
+ "(you gave: %r)" % cascade)
self.cascade = cascade
if not isinstance(constraints, (list, tuple)):
@@ -145,9 +152,10 @@ class SOCol(object):
self.notNone = False
if notNull is not NoDefault:
self.notNone = notNull
- assert notNone is NoDefault or \
- (not notNone) == (not notNull), \
- "The notNull and notNone arguments are aliases, and must not conflict. You gave notNull=%r, notNone=%r" % (notNull, notNone)
+ assert notNone is NoDefault or (not notNone) == (not notNull), (
+ "The notNull and notNone arguments are aliases, "
+ "and must not conflict. "
+ "You gave notNull=%r, notNone=%r" % (notNull, notNone))
elif notNone is not NoDefault:
self.notNone = notNone
if self.notNone:
@@ -170,7 +178,8 @@ class SOCol(object):
self.foreignName = self.name
self.name = idname
else:
- self.foreignName = soClass.sqlmeta.style.instanceIDAttrToAttr(self.name)
+ self.foreignName = soClass.sqlmeta.style.\
+ instanceIDAttrToAttr(self.name)
else:
self.foreignName = None
@@ -207,7 +216,8 @@ class SOCol(object):
elif _vlen == 1:
self.validator = _validators[0]
elif _vlen > 1:
- self.validator = compound.All.join(_validators[0], *_validators[1:])
+ self.validator = compound.All.join(
+ _validators[0], *_validators[1:])
self.noCache = noCache
self.lazy = lazy
# this is in case of ForeignKey, where we rename the column
@@ -340,9 +350,12 @@ class SOCol(object):
# of the NOT NULL clause in a create statement. So, we handle
# them differently for Enum columns.
if not isinstance(self, SOEnumCol):
- return ' '.join([self.dbName, self._firebirdType()] + self._extraSQL())
+ return ' '.join(
+ [self.dbName, self._firebirdType()] + self._extraSQL())
else:
- return ' '.join([self.dbName] + [self._firebirdType()[0]] + self._extraSQL() + [self._firebirdType()[1]])
+ return ' '.join(
+ [self.dbName] + [self._firebirdType()[0]] +
+ self._extraSQL() + [self._firebirdType()[1]])
def maxdbCreateSQL(self):
return ' '.join([self.dbName, self._maxdbType()] + self._extraSQL())
@@ -474,7 +487,8 @@ class SOStringLikeCol(SOCol):
def _check_case_sensitive(self, db):
if self.char_binary:
- raise ValueError("%s does not support binary character columns" % db)
+ raise ValueError("%s does not support "
+ "binary character columns" % db)
def _mysqlType(self):
type = self._sqlType()
@@ -543,7 +557,8 @@ class StringValidator(SOValidator):
return value.encode(dbEncoding)
if self.dataType and isinstance(value, self.dataType):
return value
- if isinstance(value, (str, buffer, binaryType, sqlbuilder.SQLExpression)):
+ if isinstance(value,
+ (str, buffer, binaryType, sqlbuilder.SQLExpression)):
return value
if hasattr(value, '__unicode__'):
return unicode(value).encode(dbEncoding)
@@ -766,7 +781,8 @@ class FloatValidator(SOValidator):
return None
if isinstance(value, (float, int, long, sqlbuilder.SQLExpression)):
return value
- for converter, attr_name in (float, '__float__'), (int, '__int__'), (long, '__long__'):
+ for converter, attr_name in (
+ (float, '__float__'), (int, '__int__'), (long, '__long__')):
if hasattr(value, attr_name):
try:
return converter(value)
@@ -832,7 +848,8 @@ class SOForeignKey(SOKeyCol):
kw['origName'] = kw['name']
kw['name'] = style.instanceAttrToIDAttr(kw['name'])
else:
- kw['name'] = style.instanceAttrToIDAttr(style.pythonClassToAttr(foreignKey))
+ kw['name'] = style.instanceAttrToIDAttr(
+ style.pythonClassToAttr(foreignKey))
super(SOForeignKey, self).__init__(**kw)
def sqliteCreateSQL(self):
@@ -878,7 +895,8 @@ class SOForeignKey(SOKeyCol):
action = 'ON DELETE RESTRICT'
else:
action = ''
- constraint = ('ALTER TABLE %(sTName)s ADD CONSTRAINT %(colName)s_exists '
+ constraint = ('ALTER TABLE %(sTName)s '
+ 'ADD CONSTRAINT %(colName)s_exists '
'FOREIGN KEY (%(colName)s) '
'REFERENCES %(tName)s (%(idName)s) '
'%(action)s' %
@@ -904,7 +922,8 @@ class SOForeignKey(SOKeyCol):
action = 'ON DELETE RESTRICT'
else:
action = ''
- constraint = ('ALTER TABLE %(sTName)s ADD CONSTRAINT %(sTLocalName)s_%(colName)s_exists '
+ constraint = ('ALTER TABLE %(sTName)s '
+ 'ADD CONSTRAINT %(sTLocalName)s_%(colName)s_exists '
'FOREIGN KEY (%(colName)s) '
'REFERENCES %(tName)s (%(idName)s) '
'%(action)s' %
@@ -952,12 +971,14 @@ class SOForeignKey(SOKeyCol):
def maxdbCreateSQL(self):
other = findClass(self.foreignKey, self.soClass.sqlmeta.registry)
fidName = self.dbName
- # I assume that foreign key name is identical to the id of the reference table
+ # I assume that foreign key name is identical
+ # to the id of the reference table
sql = ' '.join([fidName, self._maxdbType()])
tName = other.sqlmeta.table
idName = self.refColumn or other.sqlmeta.idName
sql = sql + ',' + '\n'
- sql = sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)' % (fidName, tName, idName)
+ sql = sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)' % (fidName, tName,
+ idName)
return sql
def maxdbCreateReferenceConstraint(self):
@@ -1008,13 +1029,17 @@ class SOEnumCol(SOCol):
# We need to map None in the enum expression to an appropriate
# condition on NULL
if None in self.enumValues:
- return "ENUM(%s)" % ', '.join([sqlbuilder.sqlrepr(v, 'mysql') for v in self.enumValues if v is not None])
+ return "ENUM(%s)" % ', '.join(
+ [sqlbuilder.sqlrepr(v, 'mysql') for v in self.enumValues
+ if v is not None])
else:
- return "ENUM(%s) NOT NULL" % ', '.join([sqlbuilder.sqlrepr(v, 'mysql') for v in self.enumValues])
+ return "ENUM(%s) NOT NULL" % ', '.join(
+ [sqlbuilder.sqlrepr(v, 'mysql') for v in self.enumValues])
def _postgresType(self):
length = max(map(self._getlength, self.enumValues))
- enumValues = ', '.join([sqlbuilder.sqlrepr(v, 'postgres') for v in self.enumValues])
+ enumValues = ', '.join(
+ [sqlbuilder.sqlrepr(v, 'postgres') for v in self.enumValues])
checkConstraint = "CHECK (%s in (%s))" % (self.dbName, enumValues)
return "VARCHAR(%i) %s" % (length, checkConstraint)
@@ -1028,7 +1053,8 @@ class SOEnumCol(SOCol):
def _firebirdType(self):
length = max(map(self._getlength, self.enumValues))
- enumValues = ', '.join([sqlbuilder.sqlrepr(v, 'firebird') for v in self.enumValues])
+ enumValues = ', '.join(
+ [sqlbuilder.sqlrepr(v, 'firebird') for v in self.enumValues])
checkConstraint = "CHECK (%s in (%s))" % (self.dbName, enumValues)
# NB. Return a tuple, not a string here
return "VARCHAR(%i)" % (length), checkConstraint
@@ -1087,7 +1113,8 @@ class SOSetCol(SOCol):
super(SOSetCol, self).createValidators()
def _mysqlType(self):
- return "SET(%s)" % ', '.join([sqlbuilder.sqlrepr(v, 'mysql') for v in self.setValues])
+ return "SET(%s)" % ', '.join(
+ [sqlbuilder.sqlrepr(v, 'mysql') for v in self.setValues])
class SetCol(Col):
baseClass = SOSetCol
@@ -1097,13 +1124,17 @@ class DateTimeValidator(validators.DateValidator):
def to_python(self, value, state):
if value is None:
return None
- if isinstance(value, (datetime.datetime, datetime.date, datetime.time, sqlbuilder.SQLExpression)):
+ if isinstance(value,
+ (datetime.datetime, datetime.date,
+ datetime.time, sqlbuilder.SQLExpression)):
return value
if mxdatetime_available:
if isinstance(value, DateTimeType):
# convert mxDateTime instance to datetime
- if (self.format.find("%H") >= 0) or (self.format.find("%T")) >= 0:
- return datetime.datetime(value.year, value.month, value.day,
+ if (self.format.find("%H") >= 0) or \
+ (self.format.find("%T")) >= 0:
+ return datetime.datetime(value.year, value.month,
+ value.day,
value.hour, value.minute,
int(value.second))
else:
@@ -1113,7 +1144,8 @@ class DateTimeValidator(validators.DateValidator):
if self.format.find("%d") >= 0:
return datetime.timedelta(seconds=value.seconds)
else:
- return datetime.time(value.hour, value.minute, int(value.second))
+ return datetime.time(value.hour, value.minute,
+ int(value.second))
try:
if self.format.find(".%f") >= 0:
if '.' in value:
@@ -1138,12 +1170,15 @@ class DateTimeValidator(validators.DateValidator):
def from_python(self, value, state):
if value is None:
return None
- if isinstance(value, (datetime.datetime, datetime.date, datetime.time, sqlbuilder.SQLExpression)):
+ if isinstance(value,
+ (datetime.datetime, datetime.date,
+ datetime.time, sqlbuilder.SQLExpression)):
return value
if hasattr(value, "strftime"):
return value.strftime(self.format)
raise validators.Invalid(
- "expected a datetime in the DateTimeCol '%s', got %s %r instead" % (
+ "expected a datetime in the DateTimeCol '%s', "
+ "got %s %r instead" % (
self.name, type(value), value), value, state)
if mxdatetime_available:
@@ -1151,11 +1186,13 @@ if mxdatetime_available:
def to_python(self, value, state):
if value is None:
return None
- if isinstance(value, (DateTimeType, TimeType, sqlbuilder.SQLExpression)):
+ if isinstance(value,
+ (DateTimeType, TimeType, sqlbuilder.SQLExpression)):
return value
if isinstance(value, datetime.datetime):
return DateTime.DateTime(value.year, value.month, value.day,
- value.hour, value.minute, value.second)
+ value.hour, value.minute,
+ value.second)
elif isinstance(value, datetime.date):
return DateTime.Date(value.year, value.month, value.day)
elif isinstance(value, datetime.time):
@@ -1176,7 +1213,8 @@ if mxdatetime_available:
value += '.0'
value = datetime.datetime.strptime(value, self.format)
return DateTime.DateTime(value.year, value.month, value.day,
- value.hour, value.minute, value.second)
+ value.hour, value.minute,
+ value.second)
except:
raise validators.Invalid(
"expected a date/time string of the '%s' format "
@@ -1187,7 +1225,8 @@ if mxdatetime_available:
def from_python(self, value, state):
if value is None:
return None
- if isinstance(value, (DateTimeType, TimeType, sqlbuilder.SQLExpression)):
+ if isinstance(value,
+ (DateTimeType, TimeType, sqlbuilder.SQLExpression)):
return value
if hasattr(value, "strftime"):
return value.strftime(self.format)
@@ -1212,7 +1251,8 @@ class SODateTimeCol(SOCol):
elif default_datetime_implementation == MXDATETIME_IMPLEMENTATION:
validatorClass = MXDateTimeValidator
if default_datetime_implementation:
- _validators.insert(0, validatorClass(name=self.name, format=self.datetimeFormat))
+ _validators.insert(0, validatorClass(name=self.name,
+ format=self.datetimeFormat))
return _validators
def _mysqlType(self):
@@ -1276,14 +1316,19 @@ class SODateCol(SOCol):
super(SODateCol, self).__init__(**kw)
def createValidators(self):
- """Create a validator for the column. Can be overriden in descendants."""
+ """Create a validator for the column.
+
+ Can be overriden in descendants.
+
+ """
_validators = super(SODateCol, self).createValidators()
if default_datetime_implementation == DATETIME_IMPLEMENTATION:
validatorClass = DateValidator
elif default_datetime_implementation == MXDATETIME_IMPLEMENTATION:
validatorClass = MXDateTimeValidator
if default_datetime_implementation:
- _validators.insert(0, validatorClass(name=self.name, format=self.dateFormat))
+ _validators.insert(0, validatorClass(name=self.name,
+ format=self.dateFormat))
return _validators
def _mysqlType(self):
@@ -1321,8 +1366,8 @@ class TimeValidator(DateTimeValidator):
if isinstance(value, datetime.timedelta):
if value.days:
raise validators.Invalid(
- "the value for the TimeCol '%s' must has days=0, it has days=%d" %
- (self.name, value.days), value, state)
+ "the value for the TimeCol '%s' must has days=0, "
+ "it has days=%d" % (self.name, value.days), value, state)
return datetime.time(*time.gmtime(value.seconds)[3:6])
value = super(TimeValidator, self).to_python(value, state)
if isinstance(value, datetime.datetime):
@@ -1347,7 +1392,8 @@ class SOTimeCol(SOCol):
elif default_datetime_implementation == MXDATETIME_IMPLEMENTATION:
validatorClass = MXDateTimeValidator
if default_datetime_implementation:
- _validators.insert(0, validatorClass(name=self.name, format=self.timeFormat))
+ _validators.insert(0, validatorClass(name=self.name,
+ format=self.timeFormat))
return _validators
def _mysqlType(self):
@@ -1593,7 +1639,8 @@ class BinaryValidator(SOValidator):
class SOBLOBCol(SOStringCol):
def __init__(self, **kw):
- # Change the default from 'auto' to False - this is a (mostly) binary column
+ # Change the default from 'auto' to False -
+ # this is a (mostly) binary column
if 'varchar' not in kw: kw['varchar'] = False
super(SOBLOBCol, self).__init__(**kw)
diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index 05203e3..fd458f2 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -26,7 +26,8 @@ connectionShortcuts = {
'pygresql': 'pygresql://localhost/test',
'sqlite': 'sqlite:/:memory:',
'sybase': 'sybase://test:test123@sybase/test?autoCommit=0',
- 'firebird': 'firebird://sysdba:masterkey@localhost/var/lib/firebird/data/test.gdb',
+ 'firebird':
... 11244 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
