Merge 3.5

This commit is contained in:
Victor Stinner 2015-07-20 17:13:28 +02:00
commit fd44384f33
1 changed files with 8 additions and 2 deletions

View File

@ -429,12 +429,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)