diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-19 16:11:16 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-19 16:11:16 -0400 |
| commit | 90c8d8e0c9e2d0a9eeace7fa326df26a5f28465a (patch) | |
| tree | 48b1e7fa44d5368f56be00c78c0e3d647186c497 /lib/sqlalchemy/test/testing.py | |
| parent | e4bc7d289477e22815f4c6ab86b3f0c1bf356e08 (diff) | |
| parent | c5c8cdf3b4d7dc456cfef29ea04b2b7300060c7a (diff) | |
| download | sqlalchemy-90c8d8e0c9e2d0a9eeace7fa326df26a5f28465a.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/test/testing.py')
| -rw-r--r-- | lib/sqlalchemy/test/testing.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/test/testing.py b/lib/sqlalchemy/test/testing.py index 78cd74d22..41ba3038f 100644 --- a/lib/sqlalchemy/test/testing.py +++ b/lib/sqlalchemy/test/testing.py @@ -398,6 +398,7 @@ def uses_deprecated(*messages): verbiage emitted by the sqlalchemy.util.deprecated decorator. """ + def decorate(fn): def safe(*args, **kw): # todo: should probably be strict about this, too @@ -435,8 +436,6 @@ def resetwarnings(): # warnings.simplefilter('error') - if sys.version_info < (2, 4): - warnings.filterwarnings('ignore', category=FutureWarning) def global_cleanup_assertions(): """Check things that have to be finalized at the end of a test suite. |