Changeset 391 for python/trunk/Lib/test/test_global.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_global.py (modified) (2 diffs)

python/trunk/Lib/test/test_global.py

@@ -3 +3 @@
 from test.test_support import run_unittest, check_syntax_error
 import unittest
+import warnings
 
-import warnings
-warnings.filterwarnings("error", module="<test string>")
 
 class GlobalTests(unittest.TestCase):
@@ -46 +45 @@
 
 def test_main():
-    run_unittest(GlobalTests)
+    with warnings.catch_warnings():
+        warnings.filterwarnings("error", module="<test string>")
+        run_unittest(GlobalTests)
 
 if __name__ == "__main__":