- an enormous merge just because I committed a one line log entry. the joy of DVCS

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py
index 7afcc63c5..41f3dbfed 100644
--- a/lib/sqlalchemy/testing/warnings.py
+++ b/lib/sqlalchemy/testing/warnings.py
@@ -4,6 +4,7 @@ import warnings
 from .. import exc as sa_exc
 from .. import util
 
+
 def testing_warn(msg, stacklevel=3):
     """Replaces sqlalchemy.util.warn during tests."""
 
@@ -14,6 +15,7 @@ def testing_warn(msg, stacklevel=3):
     else:
         warnings.warn_explicit(msg, filename, lineno)
 
+
 def resetwarnings():
     """Reset warning behavior to testing defaults."""
 
@@ -24,6 +26,7 @@ def resetwarnings():
     warnings.filterwarnings('error', category=sa_exc.SADeprecationWarning)
     warnings.filterwarnings('error', category=sa_exc.SAWarning)
 
+
 def assert_warnings(fn, warnings):
     """Assert that each of the given warnings are emitted by fn."""
 
@@ -31,6 +34,7 @@ def assert_warnings(fn, warnings):
 
     canary = []
     orig_warn = util.warn
+
     def capture_warnings(*args, **kw):
         orig_warn(*args, **kw)
         popwarn = warnings.pop(0)