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

Mon Oct 16 04:21:36 EDT 2017

https://github.com/python/cpython/commit/06949585d292d1a9dbf2d0d0fa8fc8fe1dee3ccf
commit: 06949585d292d1a9dbf2d0d0fa8fc8fe1dee3ccf
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017年10月16日T11:21:30+03:00
summary:
[3.6] bpo-31792: Restore os.environ in test_buffer when import numpy. (GH-4007) (#4009)
(cherry picked from commit 676db4bbf2e7c18dc7c35add17dd3bbdc2d3eeb3)
files:
M Lib/test/test_buffer.py

diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
index b83f2f107c1..f302da415d3 100644
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -17,7 +17,7 @@
 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 @@
 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
