Commit f73a46b7 authored by mattip's avatar mattip

MAINT: changes from review

parent d9a72ef1
...@@ -117,8 +117,10 @@ Other changes ...@@ -117,8 +117,10 @@ Other changes
* The search order for include files was changed. Previously it was * The search order for include files was changed. Previously it was
``include_directories``, ``Cython/Includes``, ``sys.path``. Now it is ``include_directories``, ``Cython/Includes``, ``sys.path``. Now it is
``include_directories``, ``sys.path``, ``Cython/Includes``. (Github issue ``include_directories``, ``sys.path``, ``Cython/Includes``. This was done to
#2905) allow third-party ``*.pxd`` files to override the ones in Cython.
(Github issue #2905)
0.29.7 (2019-0?-??) 0.29.7 (2019-0?-??)
=================== ===================
......
...@@ -251,10 +251,11 @@ class Context(object): ...@@ -251,10 +251,11 @@ class Context(object):
def search_include_directories(self, qualified_name, suffix, pos, def search_include_directories(self, qualified_name, suffix, pos,
include=False, sys_path=False): include=False, sys_path=False):
include_dirs = tuple(self.include_directories) include_dirs = self.include_directories
if sys_path: if sys_path:
include_dirs = include_dirs + tuple(sys.path) include_dirs = include_dirs + sys.path
include_dirs = include_dirs + (standard_include_path,) # include_dirs must be hashable for caching in @cached_function
include_dirs = tuple(include_dirs + [standard_include_path])
return search_include_directories(include_dirs, qualified_name, return search_include_directories(include_dirs, qualified_name,
suffix, pos, include) suffix, pos, include)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment