summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_os.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-07-20 15:12:57 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-07-20 15:12:57 (GMT)
commitc0b1e0f868a8688b49399ec83c05bc318bb90916 (patch)
treeb5315f992782932012233f7f53fe5c61c7b3ad91 /Lib/test/test_os.py
parent239aba7874d83eee798b19fe3fc11880516fb356 (diff)
downloadcpython-c0b1e0f868a8688b49399ec83c05bc318bb90916.zip
cpython-c0b1e0f868a8688b49399ec83c05bc318bb90916.tar.gz
cpython-c0b1e0f868a8688b49399ec83c05bc318bb90916.tar.bz2
Issue #24675: Avoid DeprecationWarning in test_os
Patch written by Martin Panter. I replace tearDown() with addCleanup().
Diffstat (limited to 'Lib/test/test_os.py')
-rw-r--r--Lib/test/test_os.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 0d49b99..adedcd9 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -361,12 +361,18 @@ class UtimeTests(unittest.TestCase):
with open(self.fname, 'wb') as fp:
fp.write(b"ABC")
+ def restore_float_times(state):
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore", DeprecationWarning)
+
+ os.stat_float_times(state)
+
# ensure that st_atime and st_mtime are float
with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning)
- old_state = os.stat_float_times(-1)
- self.addCleanup(os.stat_float_times, old_state)
+ old_float_times = os.stat_float_times(-1)
+ self.addCleanup(restore_float_times, old_float_times)
os.stat_float_times(True)