mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
(cherry picked from commit 676db4bbf2)
This commit is contained in:
Miss Islington (bot) 2017-10-16 01:21:30 -07:00 • committed by Serhiy Storchaka
parent cfc604722f
commit 06949585d2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_buffer.py
View file

@ -17,7 +17,7 @@ from test import support
from itertools import permutations, product from itertools import permutations, product
from random import randrange, sample, choice from random import randrange, sample, choice
import warnings import warnings
import sys, array, io import sys, array, io, os
from decimal import Decimal from decimal import Decimal
from fractions import Fraction from fractions import Fraction
@ -37,7 +37,8 @@ except ImportError:
ctypes = None ctypes = None
try: try:
with warnings.catch_warnings(): with support.EnvironmentVarGuard() as os.environ, \
warnings.catch_warnings():
from numpy import ndarray as numpy_array from numpy import ndarray as numpy_array
except ImportError: except ImportError:
numpy_array = None numpy_array = None