|
From: Oleg B. <no...@so...> - 2017-10-23 23:06:51
|
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 1ded887f420a85eb243f6e9db76e3c70f8934e8d (commit)
via a270c35db17fc66f414a526b0fba549b0e83706c (commit)
from df609592bd34c6c7a496ee636ca4d0fe398d3782 (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/1ded887f420a85eb243f6e9db76e3c70f8934e8d
commit 1ded887f420a85eb243f6e9db76e3c70f8934e8d
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 24 00:24:21 2017 +0300
Cleanup: Fix flake8 E741 ambiguous variable name 'l'
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index 8a57694..a97e1a8 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -62,9 +62,9 @@ class TestPeople:
phone.person = Person.selectBy(name='tim')[0]
else:
phone.person = Person.selectBy(name='bob')[0]
- l = [p.phone for p in Person.selectBy(name='tim')[0].phones]
- l.sort()
- assert l == ['555-394-2930', '555-555-5555']
+ _l = [p.phone for p in Person.selectBy(name='tim')[0].phones]
+ _l.sort()
+ assert _l == ['555-394-2930', '555-555-5555']
Phone.sqlmeta.delColumn(col, changeSchema=True)
Person.sqlmeta.delJoin(join)
diff --git a/sqlobject/tests/test_enum.py b/sqlobject/tests/test_enum.py
index d5cba13..bf2078e 100644
--- a/sqlobject/tests/test_enum.py
+++ b/sqlobject/tests/test_enum.py
@@ -10,66 +10,66 @@ from sqlobject.tests.dbtest import raises, setupClass
class Enum1(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e'])
+ cl = EnumCol(enumValues=['a', 'bcd', 'e'])
def testBad():
setupClass(Enum1)
- for l in ['a', 'bcd', 'a', 'e']:
- Enum1(l=l)
+ for _l in ['a', 'bcd', 'a', 'e']:
+ Enum1(cl=_l)
raises(
(Enum1._connection.module.IntegrityError,
Enum1._connection.module.ProgrammingError,
validators.Invalid),
- Enum1, l='b')
+ Enum1, cl='b')
class EnumWithNone(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None])
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None])
def testNone():
setupClass(EnumWithNone)
- for l in [None, 'a', 'bcd', 'a', 'e', None]:
- e = EnumWithNone(l=l)
- assert e.l == l
+ for _l in [None, 'a', 'bcd', 'a', 'e', None]:
+ e = EnumWithNone(cl=_l)
+ assert e.cl == _l
class EnumWithDefaultNone(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
def testDefaultNone():
setupClass(EnumWithDefaultNone)
e = EnumWithDefaultNone()
- assert e.l is None
+ assert e.cl is None
class EnumWithDefaultOther(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')
def testDefaultOther():
setupClass(EnumWithDefaultOther)
e = EnumWithDefaultOther()
- assert e.l == 'a'
+ assert e.cl == 'a'
class EnumUnicode(SQLObject):
n = UnicodeCol()
- l = EnumCol(enumValues=['a', 'b'])
+ cl = EnumCol(enumValues=['a', 'b'])
def testUnicode():
setupClass(EnumUnicode)
- EnumUnicode(n=u'a', l='a')
- EnumUnicode(n=u'b', l=u'b')
- EnumUnicode(n=u'\u201c', l='a')
- EnumUnicode(n=u'\u201c', l=u'b')
+ EnumUnicode(n=u'a', cl='a')
+ EnumUnicode(n=u'b', cl=u'b')
+ EnumUnicode(n=u'\u201c', cl='a')
+ EnumUnicode(n=u'\u201c', cl=u'b')
http://sourceforge.net/p/sqlobject/sqlobject/ci/a270c35db17fc66f414a526b0fba549b0e83706c
commit a270c35db17fc66f414a526b0fba549b0e83706c
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 24 00:14:06 2017 +0300
Cleanup: Fix flake8 E722 do not use bare except
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 0f35862..6771946 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -701,7 +701,7 @@ class IntValidator(SOValidator):
if hasattr(value, attr_name):
try:
return converter(value)
- except:
+ except Exception:
break
raise validators.Invalid(
"expected an int in the IntCol '%s', got %s %r instead" % (
@@ -855,7 +855,7 @@ class FloatValidator(SOValidator):
if hasattr(value, attr_name):
try:
return converter(value)
- except:
+ except Exception:
break
raise validators.Invalid(
"expected a float in the FloatCol '%s', got %s %r instead" % (
@@ -1213,7 +1213,7 @@ class SetValidator(SOValidator):
value = (value,)
try:
return ",".join(value)
- except:
+ except Exception:
raise validators.Invalid(
"expected a string or a sequence of strings "
"in the SetCol '%s', got %s %r instead" % (
@@ -1284,7 +1284,7 @@ class DateTimeValidator(validators.DateValidator):
else:
value += '.0'
return datetime.datetime.strptime(value, self.format)
- except:
+ except Exception:
raise validators.Invalid(
"expected a date/time string of the '%s' format "
"in the DateTimeCol '%s', got %s %r instead" % (
@@ -1345,7 +1345,7 @@ if mxdatetime_available:
return DateTime.DateTime(value.year, value.month, value.day,
value.hour, value.minute,
value.second)
- except:
+ except Exception:
raise validators.Invalid(
"expected a date/time string of the '%s' format "
"in the DateTimeCol '%s', got %s %r instead" % (
@@ -1625,7 +1625,7 @@ class DecimalValidator(SOValidator):
value = value.replace(connection.decimalSeparator, ".")
try:
return Decimal(value)
- except:
+ except Exception:
raise validators.Invalid(
"expected a Decimal in the DecimalCol '%s', "
"got %s %r instead" % (
@@ -1646,7 +1646,7 @@ class DecimalValidator(SOValidator):
value = value.replace(connection.decimalSeparator, ".")
try:
return Decimal(value)
- except:
+ except Exception:
raise validators.Invalid(
"can not parse Decimal value '%s' "
"in the DecimalCol from '%s'" % (
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index ff905f6..41e9b6a 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -1006,7 +1006,7 @@ class ConnectionHub(object):
try:
try:
value = func(*args, **kw)
- except:
+ except Exception:
conn.rollback()
raise
else:
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index a1340d4..f340e79 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -411,7 +411,7 @@ class InheritableSQLObject(SQLObject):
# TC: the parent if the child can not be created.
try:
super(InheritableSQLObject, self)._create(id, **kw)
- except:
+ except Exception:
# If we are outside a transaction and this is a child,
# destroy the parent
connection = self._connection
diff --git a/sqlobject/inheritance/tests/test_inheritance.py b/sqlobject/inheritance/tests/test_inheritance.py
index e1d51fa..2f5930e 100644
--- a/sqlobject/inheritance/tests/test_inheritance.py
+++ b/sqlobject/inheritance/tests/test_inheritance.py
@@ -79,7 +79,7 @@ def test_inheritance_select():
try:
person = InheritablePerson.byLastName("Oneof")
- except:
+ except Exception:
pass
else:
raise RuntimeError("unknown person %s" % person)
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 2b7bc21..e79053f 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -1227,7 +1227,7 @@ class CommandUpgrade(CommandRecord):
if not sim:
try:
conn.query(sql)
- except:
+ except Exception:
print("Error in script: %s" % upgrader)
raise
self.update_db(next_version, conn)
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 811dcd8..0201031 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -376,7 +376,7 @@ class MSSQLConnection(DBAPI):
server_version = server_version.decode('ascii')
server_version = server_version.split('.')[0]
server_version = int(server_version)
- except:
+ except Exception:
server_version = None # unknown
self._server_version = server_version
return server_version
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index bcda054..ba7e726 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -462,7 +462,7 @@ class MySQLConnection(DBAPI):
server_version = server_version[0]
server_version = tuple(int(v) for v in server_version.split('.'))
server_version = (server_version, db_tag)
- except:
+ except Exception:
server_version = None # unknown
self._server_version = server_version
return server_version
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index e58ab1a..8a57694 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -193,7 +193,7 @@ class TestAuto:
if dropper:
try:
conn.query(dropper)
- except: # Perhaps we don't have DROP permission
+ except Exception: # Perhaps we don't have DROP permission
pass
def test_classCreate(self):
-----------------------------------------------------------------------
Summary of changes:
sqlobject/col.py | 14 +++++-----
sqlobject/dbconnection.py | 2 +-
sqlobject/inheritance/__init__.py | 2 +-
sqlobject/inheritance/tests/test_inheritance.py | 2 +-
sqlobject/manager/command.py | 2 +-
sqlobject/mssql/mssqlconnection.py | 2 +-
sqlobject/mysql/mysqlconnection.py | 2 +-
sqlobject/tests/test_auto.py | 8 +++---
sqlobject/tests/test_enum.py | 34 ++++++++++++-------------
9 files changed, 34 insertions(+), 34 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
