From: Mike Bayer Date: Sat, 29 Jun 2013 14:56:34 +0000 (-0400) Subject: fix 2.5 syntaxes X-Git-Tag: rel_0_8_2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627a8cecf61f653e1c5980dd2a86dd6544333144;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix 2.5 syntaxes --- diff --git a/test/dialect/mssql/test_types.py b/test/dialect/mssql/test_types.py index 9dc1983ae9..a974e63af0 100644 --- a/test/dialect/mssql/test_types.py +++ b/test/dialect/mssql/test_types.py @@ -1,4 +1,5 @@ # -*- encoding: utf-8 +from __future__ import with_statement from sqlalchemy.testing import eq_, engines, pickleable import datetime import os @@ -366,8 +367,8 @@ class TypeRoundTripTest(fixtures.TestBase, AssertsExecutionResults, ComparesTabl )] for value in test_items: float_table.insert().execute(floatcol=value) - except Exception as e: - raise e + except Exception: + raise # todo this should suppress warnings, but it does not diff --git a/test/dialect/postgresql/test_reflection.py b/test/dialect/postgresql/test_reflection.py index fb399b5461..d8e4ea3ced 100644 --- a/test/dialect/postgresql/test_reflection.py +++ b/test/dialect/postgresql/test_reflection.py @@ -1,5 +1,5 @@ # coding: utf-8 - +from __future__ import with_statement from sqlalchemy.testing.assertions import eq_, assert_raises, \ assert_raises_message, is_, AssertsExecutionResults, \ AssertsCompiledSQL, ComparesTables @@ -32,7 +32,7 @@ class DomainReflectionTest(fixtures.TestBase, AssertsExecutionResults): : try: con.execute(ddl) - except exc.DBAPIError as e: + except exc.DBAPIError, e: if not 'already exists' in str(e): raise e con.execute('CREATE TABLE testtable (question integer, answer ' diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py index 784f8bcbf3..f0bbe86abb 100644 --- a/test/dialect/postgresql/test_types.py +++ b/test/dialect/postgresql/test_types.py @@ -1,4 +1,5 @@ # coding: utf-8 +from __future__ import with_statement from sqlalchemy.testing.assertions import eq_, assert_raises, \ assert_raises_message, is_, AssertsExecutionResults, \ AssertsCompiledSQL, ComparesTables