8000 BUG: Use keyword arguments to initialize Extension base class. by charris · Pull Request #7952 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Use keyword arguments to initialize Extension base class. #7952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2016
Merged

BUG: Use keyword arguments to initialize Extension base class. #7952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
BUG: Use keyword arguments to initialize Extension base class. 
Currently numpy.distutils.Extension class subclasses python's
distutils.extension.Extension class and initializes the base class with
a call that uses positional arguments rather than keyword arguments.
This causes problems with setuptools 25.4.0 where the Extension class
gets a new init function that expects keyword rather than positional
arguments. We should have been using keyword arguments all along and our
luck has run out, so use proper keywords

Closes #7951.
  • Loading branch information
@charris
charris committed Aug 20, 2016
commit f3b8ef0dee845b92977e25cf530de2bdd8cced73
63 changes: 33 additions & 30 deletions numpy/distutils/extension.py
View file
Open in desktop
E0CD
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,39 @@
fortran_pyf_ext_re = re.compile(r'.*[.](f90|f95|f77|for|ftn|f|pyf)\Z', re.I).match

class Extension(old_Extension):
def __init__ (self, name, sources,
include_dirs=None,
define_macros=None,
undef_macros=None,
library_dirs=None,
libraries=None,
runtime_library_dirs=None,
extra_objects=None,
extra_compile_args=None,
extra_link_args=None,
export_symbols=None,
swig_opts=None,
depends=None,
language=None,
f2py_options=None,
module_dirs=None,
extra_f77_compile_args=None,
extra_f90_compile_args=None,
):
old_Extension.__init__(self, name, [],
include_dirs,
define_macros,
undef_macros,
library_dirs,
libraries,
runtime_library_dirs,
extra_objects,
extra_compile_args,
extra_link_args,
export_symbols)
def __init__ (
self, name, sources,
include_dirs=None,
define_macros=None,
undef_macros=None,
library_dirs=None,
libraries=None,
runtime_library_dirs=None,
extra_objects=None,
extra_compile_args=None,
extra_link_args=None,
export_symbols=None,
swig_opts=None,
depends=None,
language=None,
f2py_options=None,
module_dirs=None,
extra_f77_compile_args=None,
extra_f90_compile_args=None,):

old_Extension.__init__(
self, name, [],
include_dirs=include_dirs,
define_macros=define_macros,
undef_macros=undef_macros,
library_dirs=library_dirs,
libraries=libraries,
runtime_library_dirs=runtime_library_dirs,
extra_objects=extra_objects,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
export_symbols=export_symbols)

# Avoid assert statements checking that sources contains strings:
self.sources = sources

Expand Down
0