summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-04-18 15:45:15 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-04-18 15:45:15 -0400
commit835f0abb59c10c1204884df1a19f088cf55d49d7 (patch)
tree72d0bc28c28e6dba3db2e4a8eadc72d6235853eb /lib/sqlalchemy
parent1b9c1a2ecf549c54dbf0414fdf4ea197d4ba6dbd (diff)
downloadsqlalchemy-835f0abb59c10c1204884df1a19f088cf55d49d7.tar.gz
python2.5 fix
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py3
-rw-r--r--lib/sqlalchemy/util/compat.py5
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 91e4f9736..408b119a0 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -3,9 +3,10 @@
#
# This module is part of SQLAlchemy and is released under
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
"""Provides the Session class and related utilities."""
+from __future__ import with_statement
+
import weakref
from .. import util, sql, engine, exc as sa_exc, event
from ..sql import util as sql_util, expression
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 0f0a2f674..033a87cc7 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -153,9 +153,8 @@ if py3k:
exc_type, exc_value, exc_tb = exc_info
reraise(type(exception), exception, tb=exc_tb, cause=exc_value)
else:
- exec("""def reraise(tp, value, tb=None, cause=None):
- raise tp, value, tb
- """)
+ exec("def reraise(tp, value, tb=None, cause=None):\n"
+ " raise tp, value, tb\n")
def raise_from_cause(exception, exc_info):
# not as nice as that of Py3K, but at least preserves