REF: make the separate compilation env handling a tad simpler.

yaojingguo · Jan 24, 2013 · 63cf49d · 63cf49d
1 parent 2b4c9a6
commit 63cf49d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/numpy/core/bscript b/numpy/core/bscript
@@ -30,11 +30,7 @@ from setup_common \
         C99_FUNCS_SINGLE, C99_COMPLEX_TYPES, C99_COMPLEX_FUNCS, \
         MANDATORY_FUNCS, C_ABI_VERSION, C_API_VERSION
 
-try:
-    val = os.environ['NPY_SEPARATE_COMPILATION']
-    ENABLE_SEPARATE_COMPILATION = (val != "0")
-except KeyError:
-    ENABLE_SEPARATE_COMPILATION = False
+ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "0") != "0")
 
 NUMPYCONFIG_SYM = []
 

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -12,11 +12,7 @@
 from setup_common import *
 
 # Set to True to enable multiple file compilations (experimental)
-try:
-    val = os.environ['NPY_SEPARATE_COMPILATION']
-    ENABLE_SEPARATE_COMPILATION = (val != "0")
-except KeyError:
-    ENABLE_SEPARATE_COMPILATION = False
+ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "0") != "0")
 
 # XXX: ugly, we use a class to avoid calling twice some expensive functions in
 # config.h/numpyconfig.h. I don't see a better way because distutils force