]> granicus.if.org Git - python/commitdiff
bpo-32139: test_strftime does not anymore modify the locale (GH-4569) (#4636)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 29 Nov 2017 15:29:54 +0000 (07:29 -0800)
committerxdegaye <xdegaye@gmail.com>
Wed, 29 Nov 2017 15:29:54 +0000 (16:29 +0100)
(cherry picked from commit cc55e78acab93a495c974b9a2ea71c8bb9cc2f5d)

Lib/test/test_strftime.py

index b26ebec93dc28295bc18b15c1980e70e85aadefd..325024ceaee90539cf7f537c5a003248ed6281fd 100644 (file)
@@ -60,8 +60,10 @@ class StrftimeTest(unittest.TestCase):
             import java
             java.util.Locale.setDefault(java.util.Locale.US)
         except ImportError:
-            import locale
-            locale.setlocale(locale.LC_TIME, 'C')
+            from locale import setlocale, LC_TIME
+            saved_locale = setlocale(LC_TIME)
+            setlocale(LC_TIME, 'C')
+            self.addCleanup(setlocale, LC_TIME, saved_locale)
 
     def test_strftime(self):
         now = time.time()