From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 29 Nov 2017 15:18:22 +0000 (-0800)
Subject: bpo-32139: test_strftime does not anymore modify the locale (GH-4569) (#4635)
X-Git-Tag: v3.6.4rc1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0df786258c99f98295b82ec62daea1f49912c33;p=python

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

(cherry picked from commit cc55e78acab93a495c974b9a2ea71c8bb9cc2f5d)
---

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 72b1910c38..ec305e54ff 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -58,8 +58,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()