summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Jarrett <celttechie@gmail.com>2014-07-14 19:59:01 -0600
committerBrian Jarrett <celttechie@gmail.com>2014-07-14 19:59:01 -0600
commitb5911482e3af60586b0bdb2480e8b57ca92ce523 (patch)
treebc1416372bcb7d77979cf8fefa1f548e37689e17
parent5b6b9f3a7d4301c27e2d9e9b9eab8f5f346edaf6 (diff)
downloadsqlalchemy-pr/115.tar.gz
A few more manual fixes for style E501, etc. errors in testing packagepr/115
-rw-r--r--lib/sqlalchemy/testing/assertsql.py6
-rw-r--r--lib/sqlalchemy/testing/suite/test_ddl.py8
-rw-r--r--lib/sqlalchemy/testing/suite/test_insert.py13
-rw-r--r--lib/sqlalchemy/testing/suite/test_reflection.py10
-rw-r--r--lib/sqlalchemy/testing/suite/test_results.py10
-rw-r--r--lib/sqlalchemy/testing/suite/test_sequence.py4
-rw-r--r--lib/sqlalchemy/testing/suite/test_types.py3
7 files changed, 28 insertions, 26 deletions
diff --git a/lib/sqlalchemy/testing/assertsql.py b/lib/sqlalchemy/testing/assertsql.py
index 1c2dd2738..bcc999fe3 100644
--- a/lib/sqlalchemy/testing/assertsql.py
+++ b/lib/sqlalchemy/testing/assertsql.py
@@ -101,7 +101,7 @@ class ExactSQL(SQLMatchRule):
if not self._result:
self._errmsg = (
'Testing for exact statement %r exact params %r, '
- 'received %r with params %r' %
+ 'received %r with params %r' %
(sql, params, _received_statement, _received_parameters))
@@ -204,12 +204,12 @@ class CompiledSQL(SQLMatchRule):
self._result = equivalent
if not self._result:
print('Testing for compiled statement %r partial params '
- '%r, received %r with params %r' %
+ '%r, received %r with params %r' %
(self.statement, all_params,
_received_statement, all_received))
self._errmsg = (
'Testing for compiled statement %r partial params %r, '
- 'received %r with params %r' %
+ 'received %r with params %r' %
(self.statement, all_params,
_received_statement, all_received))
diff --git a/lib/sqlalchemy/testing/suite/test_ddl.py b/lib/sqlalchemy/testing/suite/test_ddl.py
index 0c17fc823..1d8010c8a 100644
--- a/lib/sqlalchemy/testing/suite/test_ddl.py
+++ b/lib/sqlalchemy/testing/suite/test_ddl.py
@@ -12,15 +12,15 @@ class TableDDLTest(fixtures.TestBase):
def _simple_fixture(self):
return Table('test_table', self.metadata,
- Column(
- 'id', Integer, primary_key=True, autoincrement=False),
+ Column('id', Integer, primary_key=True,
+ autoincrement=False),
Column('data', String(50))
)
def _underscore_fixture(self):
return Table('_test_table', self.metadata,
- Column(
- 'id', Integer, primary_key=True, autoincrement=False),
+ Column('id', Integer, primary_key=True,
+ autoincrement=False),
Column('_data', String(50))
)
diff --git a/lib/sqlalchemy/testing/suite/test_insert.py b/lib/sqlalchemy/testing/suite/test_insert.py
index 8855fb8cb..92d3d93e5 100644
--- a/lib/sqlalchemy/testing/suite/test_insert.py
+++ b/lib/sqlalchemy/testing/suite/test_insert.py
@@ -59,8 +59,9 @@ class LastrowidTest(fixtures.TablesTest):
)
# failed on pypy1.9 but seems to be OK on pypy 2.1
- #@exclusions.fails_if(lambda: util.pypy, "lastrowid not maintained after "
- # "connection close")
+ # @exclusions.fails_if(lambda: util.pypy,
+ # "lastrowid not maintained after "
+ # "connection close")
@requirements.dbapi_lastrowid
def test_native_lastrowid_autoinc(self):
r = config.db.execute(
@@ -143,10 +144,10 @@ class InsertBehaviorTest(fixtures.TablesTest):
config.db.execute(
table.insert(inline=True).
- from_select(
- ("id", "data",), select([table.c.id + 5, table.c.data]).where(
- table.c.data.in_(["data2", "data3"]))
- ),
+ from_select(("id", "data",),
+ select([table.c.id + 5, table.c.data]).
+ where(table.c.data.in_(["data2", "data3"]))
+ ),
)
eq_(
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index fcef8cdee..7cc5fd160 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -58,7 +58,8 @@ class ComponentReflectionTest(fixtures.TablesTest):
Column('test1', sa.CHAR(5), nullable=False),
Column('test2', sa.Float(5), nullable=False),
Column('parent_user_id', sa.Integer,
- sa.ForeignKey('%susers.user_id' % schema_prefix)),
+ sa.ForeignKey('%susers.user_id' %
+ schema_prefix)),
schema=schema,
test_needs_fk=True,
)
@@ -223,7 +224,8 @@ class ComponentReflectionTest(fixtures.TablesTest):
# a base within one of the generic types.
self.assert_(len(set(ctype.__mro__).
- intersection(ctype_def.__mro__).intersection([
+ intersection(ctype_def.__mro__).
+ intersection([
sql_types.Integer,
sql_types.Numeric,
sql_types.DateTime,
@@ -231,8 +233,8 @@ class ComponentReflectionTest(fixtures.TablesTest):
sql_types.Time,
sql_types.String,
sql_types._Binary,
- ])) > 0, '%s(%s), %s(%s)' % (col.name,
- col.type, cols[i]['name'], ctype))
+ ])) > 0, '%s(%s), %s(%s)' %
+ (col.name, col.type, cols[i]['name'], ctype))
if not col.primary_key:
assert cols[i]['default'] is None
diff --git a/lib/sqlalchemy/testing/suite/test_results.py b/lib/sqlalchemy/testing/suite/test_results.py
index 57dfc6847..9ffaa6e04 100644
--- a/lib/sqlalchemy/testing/suite/test_results.py
+++ b/lib/sqlalchemy/testing/suite/test_results.py
@@ -127,12 +127,10 @@ class PercentSchemaNamesTest(fixtures.TablesTest):
Column(
"spaces % more spaces", Integer),
)
- cls.tables.lightweight_percent_table = sql.table('percent%table',
- sql.column(
- "percent%"),
- sql.column(
- "spaces % more spaces"),
- )
+ cls.tables.lightweight_percent_table = sql.table(
+ 'percent%table', sql.column("percent%"),
+ sql.column("spaces % more spaces")
+ )
def test_single_roundtrip(self):
percent_table = self.tables.percent_table
diff --git a/lib/sqlalchemy/testing/suite/test_sequence.py b/lib/sqlalchemy/testing/suite/test_sequence.py
index a1d1a0515..bbb4ba65c 100644
--- a/lib/sqlalchemy/testing/suite/test_sequence.py
+++ b/lib/sqlalchemy/testing/suite/test_sequence.py
@@ -89,8 +89,8 @@ class HasSequenceTest(fixtures.TestBase):
s1 = Sequence('user_id_seq', schema="test_schema")
testing.db.execute(schema.CreateSequence(s1))
try:
- eq_(testing.db.dialect.has_sequence(testing.db,
- 'user_id_seq', schema="test_schema"), True)
+ eq_(testing.db.dialect.has_sequence(
+ testing.db, 'user_id_seq', schema="test_schema"), True)
finally:
testing.db.execute(schema.DropSequence(s1))
diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 594a89ed1..230aeb1e9 100644
--- a/lib/sqlalchemy/testing/suite/test_types.py
+++ b/lib/sqlalchemy/testing/suite/test_types.py
@@ -333,7 +333,8 @@ class NumericTest(_LiteralRoundTripFixture, fixtures.TestBase):
@testing.emits_warning(r".*does \*not\* support Decimal objects natively")
@testing.provide_metadata
- def _do_test(self, type_, input_, output, filter_=None, check_scale=False):
+ def _do_test(self, type_, input_, output,
+ filter_=None, check_scale=False):
metadata = self.metadata
t = Table('t', metadata, Column('x', type_))
t.create()