|
From: Oleg B. <no...@so...> - 2015-02-15 13:12: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 46d0d0ae10564e7970afef57813b2e7a3a44b39a (commit)
via 972ccbf8480472c80a9b03caf81514116ad7df6f (commit)
from 6e78d01d110fecb8502daccac51ea30e17fe86e4 (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/46d0d0ae10564e7970afef57813b2e7a3a44b39a
commit 46d0d0ae10564e7970afef57813b2e7a3a44b39a
Merge: 6e78d01 972ccbf
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 15 16:11:17 2015 +0300
Merge pull request #82 from lukmdo/fixE131_F403
Fix flake8 E131 (and F403 outside tests)
E131 continuation line unaligned for hanging indent.
F403 'from module import *' used; unable to detect undefined names.
http://sourceforge.net/p/sqlobject/sqlobject/ci/972ccbf8480472c80a9b03caf81514116ad7df6f
commit 972ccbf8480472c80a9b03caf81514116ad7df6f
Author: Lukasz Dobrzanski <luk...@gm...>
Date: Sun Feb 15 12:50:07 2015 +0000
fix E131 (and F403 outside tests)
diff --git a/sqlobject/index.py b/sqlobject/index.py
index ca0fd50..ad676dc 100644
--- a/sqlobject/index.py
+++ b/sqlobject/index.py
@@ -1,5 +1,4 @@
from itertools import count
-from types import *
from .converters import sqlrepr
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 7e20839..52d9363 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -238,8 +238,7 @@ class Command(object):
dependency_stack.append(cls)
raise SQLObjectCircularReferenceError(
"Found a circular reference: %s " %
- (' --> '.join([x.__name__
- for x in dependency_stack])))
+ (' --> '.join([x.__name__ for x in dependency_stack])))
dependency_stack.append(cls)
# Recursively inspect dependent classes.
depended = findReverseDependencies(cls)
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index e09f1ad..c61a38e 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -1,6 +1,6 @@
from sqlobject import col
+from sqlobject import dberrors
from sqlobject.dbconnection import DBAPI
-from sqlobject.dberrors import *
class ErrorMessage(str):
@@ -82,7 +82,7 @@ class MySQLConnection(DBAPI):
conninfo = ("; used connection string: "
"host=%(host)s, port=%(port)s, "
"db=%(db)s, user=%(user)s" % self.__dict__)
- raise OperationalError(ErrorMessage(e, conninfo))
+ raise dberrors.OperationalError(ErrorMessage(e, conninfo))
if hasattr(conn, 'autocommit'):
conn.autocommit(bool(self.autoCommit))
@@ -126,33 +126,33 @@ class MySQLConnection(DBAPI):
if e.args[0] in (self.module.constants.CR.SERVER_GONE_ERROR,
self.module.constants.CR.SERVER_LOST):
if count == 2:
- raise OperationalError(ErrorMessage(e))
+ raise dberrors.OperationalError(ErrorMessage(e))
if self.debug:
self.printDebug(conn, str(e), 'ERROR')
else:
- raise OperationalError(ErrorMessage(e))
+ raise dberrors.OperationalError(ErrorMessage(e))
except self.module.IntegrityError as e:
msg = ErrorMessage(e)
if e.args[0] == self.module.constants.ER.DUP_ENTRY:
- raise DuplicateEntryError(msg)
+ raise dberrors.DuplicateEntryError(msg)
else:
- raise IntegrityError(msg)
+ raise dberrors.IntegrityError(msg)
except self.module.InternalError as e:
- raise InternalError(ErrorMessage(e))
+ raise dberrors.InternalError(ErrorMessage(e))
except self.module.ProgrammingError as e:
- raise ProgrammingError(ErrorMessage(e))
+ raise dberrors.ProgrammingError(ErrorMessage(e))
except self.module.DataError as e:
- raise DataError(ErrorMessage(e))
+ raise dberrors.DataError(ErrorMessage(e))
except self.module.NotSupportedError as e:
- raise NotSupportedError(ErrorMessage(e))
+ raise dberrors.NotSupportedError(ErrorMessage(e))
except self.module.DatabaseError as e:
- raise DatabaseError(ErrorMessage(e))
+ raise dberrors.DatabaseError(ErrorMessage(e))
except self.module.InterfaceError as e:
- raise InterfaceError(ErrorMessage(e))
+ raise dberrors.InterfaceError(ErrorMessage(e))
except self.module.Warning as e:
raise Warning(ErrorMessage(e))
except self.module.Error as e:
- raise Error(ErrorMessage(e))
+ raise dberrors.Error(ErrorMessage(e))
def _queryInsertID(self, conn, soInstance, id, names, values):
table = soInstance.sqlmeta.table
@@ -206,7 +206,7 @@ class MySQLConnection(DBAPI):
# which is not always True (for an embedded application, e.g.)
self.query('DESCRIBE %s' % (tableName))
return True
- except ProgrammingError as e:
+ except dberrors.ProgrammingError as e:
if e[0].code == 1146: # ER_NO_SUCH_TABLE
return False
raise
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index c4f414d..63afa14 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -1,9 +1,9 @@
from sqlobject.dbconnection import DBAPI
import re
from sqlobject import col
+from sqlobject import dberrors
from sqlobject import sqlbuilder
from sqlobject.converters import registerConverter
-from sqlobject.dberrors import *
class ErrorMessage(str):
@@ -149,7 +149,7 @@ class PostgresConnection(DBAPI):
else:
conn = self.module.connect(**self.dsn_dict)
except self.module.OperationalError as e:
- raise OperationalError(
+ raise dberrors.OperationalError(
ErrorMessage(e, "used connection string %r" % self.dsn))
# For printDebug in _executeRetry
@@ -172,29 +172,29 @@ class PostgresConnection(DBAPI):
try:
return cursor.execute(query)
except self.module.OperationalError as e:
- raise OperationalError(ErrorMessage(e))
+ raise dberrors.OperationalError(ErrorMessage(e))
except self.module.IntegrityError as e:
msg = ErrorMessage(e)
if e.pgcode == '23505':
- raise DuplicateEntryError(msg)
+ raise dberrors.DuplicateEntryError(msg)
else:
- raise IntegrityError(msg)
+ raise dberrors.IntegrityError(msg)
except self.module.InternalError as e:
- raise InternalError(ErrorMessage(e))
+ raise dberrors.InternalError(ErrorMessage(e))
except self.module.ProgrammingError as e:
- raise ProgrammingError(ErrorMessage(e))
+ raise dberrors.ProgrammingError(ErrorMessage(e))
except self.module.DataError as e:
- raise DataError(ErrorMessage(e))
+ raise dberrors.DataError(ErrorMessage(e))
except self.module.NotSupportedError as e:
- raise NotSupportedError(ErrorMessage(e))
+ raise dberrors.NotSupportedError(ErrorMessage(e))
except self.module.DatabaseError as e:
- raise DatabaseError(ErrorMessage(e))
+ raise dberrors.DatabaseError(ErrorMessage(e))
except self.module.InterfaceError as e:
- raise InterfaceError(ErrorMessage(e))
+ raise dberrors.InterfaceError(ErrorMessage(e))
except self.module.Warning as e:
raise Warning(ErrorMessage(e))
except self.module.Error as e:
- raise Error(ErrorMessage(e))
+ raise dberrors.Error(ErrorMessage(e))
def _queryInsertID(self, conn, soInstance, id, names, values):
table = soInstance.sqlmeta.table
diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index f245fa2..1710143 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -8,9 +8,9 @@ try:
from urllib import quote
except ImportError:
from urllib.parse import quote
-from sqlobject.dbconnection import DBAPI, Boolean
from sqlobject import col
-from sqlobject.dberrors import *
+from sqlobject import dberrors
+from sqlobject.dbconnection import DBAPI, Boolean
sqlite2_Binary = None
@@ -219,30 +219,30 @@ class SQLiteConnection(DBAPI):
try:
return cursor.execute(query)
except self.module.OperationalError as e:
- raise OperationalError(ErrorMessage(e))
+ raise dberrors.OperationalError(ErrorMessage(e))
except self.module.IntegrityError as e:
msg = ErrorMessage(e)
if msg.startswith('column') and msg.endswith('not unique') \
or msg.startswith('UNIQUE constraint failed:'):
- raise DuplicateEntryError(msg)
+ raise dberrors.DuplicateEntryError(msg)
else:
- raise IntegrityError(msg)
+ raise dberrors.IntegrityError(msg)
except self.module.InternalError as e:
- raise InternalError(ErrorMessage(e))
+ raise dberrors.InternalError(ErrorMessage(e))
except self.module.ProgrammingError as e:
- raise ProgrammingError(ErrorMessage(e))
+ raise dberrors.ProgrammingError(ErrorMessage(e))
except self.module.DataError as e:
- raise DataError(ErrorMessage(e))
+ raise dberrors.DataError(ErrorMessage(e))
except self.module.NotSupportedError as e:
- raise NotSupportedError(ErrorMessage(e))
+ raise dberrors.NotSupportedError(ErrorMessage(e))
except self.module.DatabaseError as e:
- raise DatabaseError(ErrorMessage(e))
+ raise dberrors.DatabaseError(ErrorMessage(e))
except self.module.InterfaceError as e:
- raise InterfaceError(ErrorMessage(e))
+ raise dberrors.InterfaceError(ErrorMessage(e))
except self.module.Warning as e:
raise Warning(ErrorMessage(e))
except self.module.Error as e:
- raise Error(ErrorMessage(e))
+ raise dberrors.Error(ErrorMessage(e))
def _queryInsertID(self, conn, soInstance, id, names, values):
table = soInstance.sqlmeta.table
diff --git a/sqlobject/versioning/__init__.py b/sqlobject/versioning/__init__.py
index 0770d40..eda26cb 100644
--- a/sqlobject/versioning/__init__.py
+++ b/sqlobject/versioning/__init__.py
@@ -1,6 +1,7 @@
-from sqlobject import *
from datetime import datetime
+from sqlobject import col, events, SQLObject, AND
+
class Version(SQLObject):
def restore(self):
@@ -47,7 +48,7 @@ class Version(SQLObject):
def getColumns(columns, cls):
for column, defi in cls.sqlmeta.columnDefinitions.items():
- if column.endswith("ID") and isinstance(defi, ForeignKey):
+ if column.endswith("ID") and isinstance(defi, col.ForeignKey):
column = column[:-2]
# remove incompatible constraints
@@ -74,8 +75,8 @@ class Versioning(object):
self.name = name
self.soClass = soClass
- attrs = {'dateArchived': DateTimeCol(default=datetime.now),
- 'master': ForeignKey(self.soClass.__name__),
+ attrs = {'dateArchived': col.DateTimeCol(default=datetime.now),
+ 'master': col.ForeignKey(self.soClass.__name__),
'masterClass': self.soClass,
'extraCols': self.extraCols
}
diff --git a/sqlobject/views.py b/sqlobject/views.py
index dddc3a3..1f4f8fa 100644
--- a/sqlobject/views.py
+++ b/sqlobject/views.py
@@ -1,4 +1,4 @@
-from .sqlbuilder import *
+from .sqlbuilder import * # noqa
from .main import SQLObject
-----------------------------------------------------------------------
Summary of changes:
sqlobject/index.py | 1 -
sqlobject/manager/command.py | 3 +--
sqlobject/mysql/mysqlconnection.py | 28 ++++++++++++++--------------
sqlobject/postgres/pgconnection.py | 24 ++++++++++++------------
sqlobject/sqlite/sqliteconnection.py | 24 ++++++++++++------------
sqlobject/versioning/__init__.py | 9 +++++----
sqlobject/views.py | 2 +-
7 files changed, 45 insertions(+), 46 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
