|
From: Oleg B. <no...@so...> - 2015-02-14 21:51:46
|
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 917dbcd7680600f9f308a9fdf8ed1bf81f8eca66 (commit)
via 893d240807ea9dd2093e45ed19b9ddd0c361f6af (commit)
from f89bd3cd9d20ac07d36c966b396a7ca1c8025cff (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/917dbcd7680600f9f308a9fdf8ed1bf81f8eca66
commit 917dbcd7680600f9f308a9fdf8ed1bf81f8eca66
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 15 00:50:16 2015 +0300
Fix flake8 E123 closing bracket does not match indentation
Closing bracket does not match indentation of opening bracket's line.
diff --git a/setup.py b/setup.py
index 650a0b9..f89bc38 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ if is_setuptools:
'sybase': ['Sybase'],
'mssql': ['adodbapi'], # or pymssql
'sapdb': ['sapdb'],
- }
+ }
setup(name="SQLObject",
version=version,
diff --git a/sqlobject/boundattributes.py b/sqlobject/boundattributes.py
index a2ba863..221e231 100644
--- a/sqlobject/boundattributes.py
+++ b/sqlobject/boundattributes.py
@@ -58,7 +58,7 @@ class BoundAttribute(declarative.Declarative):
'set_object',
'make_object',
'clone_in_subclass',
- )
+ )
_all_attrs = ()
clone_for_subclass = True
diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index d50a6a9..1d9dc26 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -29,7 +29,7 @@ connectionShortcuts = {
'firebird':
'firebird://sysdba:masterkey@localhost/var/lib/firebird/data/test.gdb',
'mssql': 'mssql://sa:@127.0.0.1/test'
- }
+}
def pytest_addoption(parser):
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index 7b74d3d..ba59c3b 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -95,7 +95,7 @@ class FirebirdConnection(DBAPI):
role=self.role,
charset=self.dbEncoding,
**extra
- )
+ )
def _queryInsertID(self, conn, soInstance, id, names, values):
"""Firebird uses 'generators' to create new ids for a table.
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index c37d606..403e4b5 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -329,9 +329,9 @@ class SOSQLRelatedJoin(SORelatedJoin):
),
TableToId(self.soClass.sqlmeta.table, self.soClass.sqlmeta.idName,
inst.id),
- ), clauseTables=(self.soClass.sqlmeta.table,
- self.otherClass.sqlmeta.table,
- self.intermediateTable),
+ ), clauseTables=(self.soClass.sqlmeta.table,
+ self.otherClass.sqlmeta.table,
+ self.intermediateTable),
connection=conn)
return results.orderBy(self.orderBy)
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index aaec8bd..2beadc9 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -282,7 +282,7 @@ operatorMap = {
">": operator.gt,
"IN": operator.contains,
"IS": operator.eq,
- }
+}
class SQLOp(SQLExpression):
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index ae8e46c..fd3e0dd 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -341,7 +341,7 @@ class SelectResults(object):
colName = col.name
query = self.queryForSelect().newItems([
sqlbuilder.ColumnAS(getattr(self.sourceClass.q, colName), colName)
- ]).orderBy(None).distinct()
+ ]).orderBy(None).distinct()
query = sqlbuilder.Alias(query,
"%s_%s" % (self.sourceClass.__name__,
col.name))
diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index 5edf3f8..d3f156a 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -42,7 +42,7 @@ supportsMatrix = {
'-limitSelect': 'mssql',
'+schema': 'postgres',
'+memorydb': 'sqlite',
- }
+}
def setupClass(soClasses, force=False):
http://sourceforge.net/p/sqlobject/sqlobject/ci/893d240807ea9dd2093e45ed19b9ddd0c361f6af
commit 893d240807ea9dd2093e45ed19b9ddd0c361f6af
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 15 00:45:55 2015 +0300
Fix flake8 E402 module level import not at top of file
diff --git a/setup.py b/setup.py
index a356eb5..650a0b9 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ except ImportError:
versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
load_source("sqlobject_version", versionpath)
-from sqlobject_version import version
+from sqlobject_version import version # noqa: ignore flake8 E402
subpackages = ['firebird', 'include',
'inheritance', 'inheritance.tests',
diff --git a/sqlobject/boundattributes.py b/sqlobject/boundattributes.py
index 9b04b2e..a2ba863 100644
--- a/sqlobject/boundattributes.py
+++ b/sqlobject/boundattributes.py
@@ -23,13 +23,15 @@ subclasses, use ``bind_attributes_local``, which adds a
attributes.
"""
-__all__ = ['BoundAttribute', 'BoundFactory', 'bind_attributes',
- 'bind_attributes_local']
from . import declarative
from . import events
+__all__ = ['BoundAttribute', 'BoundFactory', 'bind_attributes',
+ 'bind_attributes_local']
+
+
class BoundAttribute(declarative.Declarative):
"""
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 3cdf9a1..7c3df4e 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -19,13 +19,16 @@ are what gets used.
"""
from array import array
+from decimal import Decimal
from itertools import count
+import sys
import time
try:
import cPickle as pickle
except ImportError:
import pickle
import weakref
+
from formencode import compound, validators
from .classregistry import findClass
# Sadly the name "constraints" conflicts with many of the function
@@ -34,8 +37,6 @@ from . import constraints as constrs
from . import sqlbuilder
from .styles import capword
-NoDefault = sqlbuilder.NoDefault
-
import datetime
datetime_available = True
@@ -64,19 +65,19 @@ if mxdatetime_available:
DateTimeType = type(DateTime.DateTime())
TimeType = type(DateTime.DateTime.Time(DateTime.DateTime()))
-default_datetime_implementation = DATETIME_IMPLEMENTATION
-
__all__ = ["datetime_available", "mxdatetime_available",
"default_datetime_implementation", "DATETIME_IMPLEMENTATION"]
if mxdatetime_available:
__all__.append("MXDATETIME_IMPLEMENTATION")
-import sys
+default_datetime_implementation = DATETIME_IMPLEMENTATION
+
if sys.version_info[0] > 2:
# alias for python 3 compatability
long = int
+NoDefault = sqlbuilder.NoDefault
creationOrder = count()
@@ -1503,9 +1504,6 @@ class TimedeltaCol(Col):
baseClass = SOTimedeltaCol
-from decimal import Decimal
-
-
class DecimalValidator(SOValidator):
def to_python(self, value, state):
if value is None:
diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index fa29e1c..d50a6a9 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -3,10 +3,6 @@ This module is used by py.test to configure testing for this
application.
"""
-# Override some options (doesn't override command line):
-verbose = 0
-exitfirst = True
-
import py
import sqlobject
@@ -17,6 +13,10 @@ except ImportError: # Python 2.2
else:
pkg_resources.require('SQLObject')
+# Override some options (doesn't override command line):
+verbose = 0
+exitfirst = True
+
connectionShortcuts = {
'mysql': 'mysql://test@localhost/test',
'dbm': 'dbm:///data',
diff --git a/sqlobject/include/hashcol.py b/sqlobject/include/hashcol.py
index 950fdd1..81e5c7a 100644
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@ -1,7 +1,7 @@
-__all__ = ['HashCol']
+import sqlobject.col
-import sqlobject.col
+__all__ = ['HashCol']
class DbHash:
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index 63c8ec1..c37d606 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -1,4 +1,5 @@
from itertools import count
+from . import boundattributes
from . import classregistry
from . import events
from . import styles
@@ -371,9 +372,6 @@ class SingleJoin(Join):
baseClass = SOSingleJoin
-from . import boundattributes
-
-
class SOManyToMany(object):
def __init__(self, soClass, name, join,
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index 3b9c8ac..a00f8fb 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -1,10 +1,9 @@
from datetime import datetime
-now = datetime.now
+from py.test import raises
from sqlobject import *
from sqlobject.tests.dbtest import *
from sqlobject import classregistry
-from py.test import raises
########################################
@@ -12,6 +11,9 @@ from py.test import raises
########################################
+now = datetime.now
+
+
class Person(SQLObject):
class sqlmeta:
diff --git a/sqlobject/tests/test_datetime.py b/sqlobject/tests/test_datetime.py
index b4354e5..af93fed 100644
--- a/sqlobject/tests/test_datetime.py
+++ b/sqlobject/tests/test_datetime.py
@@ -1,5 +1,8 @@
+from datetime import datetime, date, time
import py.test
+
from sqlobject import *
+from sqlobject import col
from sqlobject.tests.dbtest import *
@@ -8,9 +11,7 @@ from sqlobject.tests.dbtest import *
########################################
-from sqlobject import col
col.default_datetime_implementation = DATETIME_IMPLEMENTATION
-from datetime import datetime, date, time
class DateTime1(SQLObject):
-----------------------------------------------------------------------
Summary of changes:
setup.py | 4 ++--
sqlobject/boundattributes.py | 8 +++++---
sqlobject/col.py | 14 ++++++--------
sqlobject/conftest.py | 10 +++++-----
sqlobject/firebird/firebirdconnection.py | 2 +-
sqlobject/include/hashcol.py | 4 ++--
sqlobject/joins.py | 10 ++++------
sqlobject/sqlbuilder.py | 2 +-
sqlobject/sresults.py | 2 +-
sqlobject/tests/dbtest.py | 2 +-
sqlobject/tests/test_auto.py | 6 ++++--
sqlobject/tests/test_datetime.py | 5 +++--
12 files changed, 35 insertions(+), 34 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
