commit bc19cf57a8f061bbb1961aa069ed54e8361023ae
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Wed Nov 29 07:29:54 2017 -0800
committer xdegaye <xdegaye@gmail.com> Wed Nov 29 16:29:54 2017 +0100
tree fd725d95c92671fd61ca401edb81d67b85ccd69b
parent fc73c54dae46e6c47dcd4a535f7bc68a46b8e398

bpo-32139: test_strftime does not anymore modify the locale (GH-4569) (#4636)

(cherry picked from commit cc55e78acab93a495c974b9a2ea71c8bb9cc2f5d)

Lib/test/test_strftime.py

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index b26ebec..325024c 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -60,8 +60,10 @@
             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()