From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 16 Oct 2017 08:21:30 +0000 (-0700)
Subject: [3.6] bpo-31792: Restore os.environ in test_buffer when import numpy. (GH-4007) ... 
X-Git-Tag: v3.6.4rc1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06949585d292d1a9dbf2d0d0fa8fc8fe1dee3ccf;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-31792: Restore os.environ in test_buffer when import numpy. (GH-4007) (#4009)

(cherry picked from commit 676db4bbf2e7c18dc7c35add17dd3bbdc2d3eeb3)
---

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index b83f2f107c1c..f302da415d33 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -17,7 +17,7 @@ from test import support
 from itertools import permutations, product
 from random import randrange, sample, choice
 import warnings
-import sys, array, io
+import sys, array, io, os
 from decimal import Decimal
 from fractions import Fraction
 
@@ -37,7 +37,8 @@ except ImportError:
     ctypes = None
 
 try:
-    with warnings.catch_warnings():
+    with support.EnvironmentVarGuard() as os.environ, \
+         warnings.catch_warnings():
         from numpy import ndarray as numpy_array
 except ImportError:
     numpy_array = None