From 4dbe9675f46fd2b2481905afde76a07b7a79a701 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 17 Oct 2015 15:52:54 -0500
Subject: [PATCH] Aksetup: fix superclass ref
---
aksetup_helper.py | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/aksetup_helper.py b/aksetup_helper.py
index c527684f..b7378b55 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
import setuptools # noqa
from setuptools import Extension
@@ -49,8 +47,11 @@ class NumpyExtension(Extension):
from os.path import join
return join(pathname, "core", "include")
+ def get_additional_include_dirs(self):
+ return [self.get_numpy_incpath()]
+
def get_include_dirs(self):
- return self._include_dirs + [self.get_numpy_incpath()]
+ return self._include_dirs + self.get_additional_include_dirs()
def set_include_dirs(self, value):
self._include_dirs = value
@@ -66,12 +67,9 @@ class PyUblasExtension(NumpyExtension):
from pkg_resources import Requirement, resource_filename
return resource_filename(Requirement.parse(name), "%s/include" % name)
- @property
- def include_dirs(self):
- return self._include_dirs + [
- self.get_numpy_incpath(),
- self.get_module_include_path("pyublas"),
- ]
+ def get_additional_include_dirs(self):
+ return (NumpyExtension.get_additional_include_dirs(self)
+ + [self.get_module_include_path("pyublas")])
class HedgeExtension(PyUblasExtension):
@@ -280,11 +278,11 @@ class ConfigSchema:
if "__builtins__" in filevars:
del filevars["__builtins__"]
- for key, value in list(config.items()):
+ for key, value in config.items():
if value is not None:
filevars[key] = value
- keys = list(filevars.keys())
+ keys = filevars.keys()
keys.sort()
outf = open(filename, "w")
@@ -494,7 +492,7 @@ class BoostLibraries(Libraries):
Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
[default_lib_name],
help="Library names for Boost C++ %s library (without lib or .so)"
- % humanize(lib_base_name))
+ % humanize(lib_base_name))
def set_up_shipped_boost_if_requested(project_name, conf, source_path=None,
--
GitLab