- [feature] Added "no_autoflush" context

manager to Session, used with with:
will temporarily disable autoflush.

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 571294025..13914aa7d 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -7,7 +7,7 @@
 from compat import callable, cmp, reduce, defaultdict, py25_dict, \
     threading, py3k_warning, jython, pypy, win32, set_types, buffer, pickle, \
     update_wrapper, partial, md5_hex, decode_slice, dottedgetter,\
-    parse_qsl, any
+    parse_qsl, any, contextmanager
 
 from _collections import NamedTuple, ImmutableContainer, immutabledict, \
     Properties, OrderedProperties, ImmutableProperties, OrderedDict, \
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 07652f3c6..99b92b1e3 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -57,6 +57,12 @@ buffer = buffer
 # end Py2K
 
 try:
+    from contextlib import contextmanager
+except ImportError:
+    def contextmanager(fn):
+        return fn
+
+try:
     from functools import update_wrapper
 except ImportError:
     def update_wrapper(wrapper, wrapped,