summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Kaufmann <rka081+numpy@uib.no>2017-02-10 10:00:04 +0100
committerRoland Kaufmann <rka081+numpy@uib.no>2017-02-23 10:05:58 +0100
commitf228d75bfa4d4f3964dfc6cbfbbf982e95ce94ab (patch)
tree8336d26696d14d494e046bb26eb78632427f4d5b
parent081a865d3d243c282dc452c28dbe89e80d8bccb0 (diff)
downloadnumpy-f228d75bfa4d4f3964dfc6cbfbbf982e95ce94ab.tar.gz
BUG: Correct signature of inherited method
The msvccompiler module is made in the same mold as the msvc9compiler module; saving the two environment variables around the call to initialize. However, the signaure in the msvccompiler module's version of the MSVCCompiler class, there is no plat_name argument to the method. Since this is not used anyway but just passed along, it can simply be removed. This bug can be exposed even if you are not using the Intel Fortran compiler, because the class is loaded in an attempt to probe for all compilers, if the correct compiler is not found yet.
-rw-r--r--numpy/distutils/msvccompiler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/distutils/msvccompiler.py b/numpy/distutils/msvccompiler.py
index 575013a11..903d75188 100644
--- a/numpy/distutils/msvccompiler.py
+++ b/numpy/distutils/msvccompiler.py
@@ -42,12 +42,12 @@ class MSVCCompiler(_MSVCCompiler):
def __init__(self, verbose=0, dry_run=0, force=0):
_MSVCCompiler.__init__(self, verbose, dry_run, force)
- def initialize(self, plat_name=None):
+ def initialize(self):
# The 'lib' and 'include' variables may be overwritten
# by MSVCCompiler.initialize, so save them for later merge.
environ_lib = os.getenv('lib', '')
environ_include = os.getenv('include', '')
- _MSVCCompiler.initialize(self, plat_name)
+ _MSVCCompiler.initialize(self)
# Merge current and previous values of 'lib' and 'include'
os.environ['lib'] = _merge(environ_lib, os.environ['lib'])