aboutsummaryrefslogtreecommitdiffstats
path: root/waflib/extras/cython.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:04 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 18:14:27 +0100
commit8c3d48d190cb73d73891ed704c84707d16c27272 (patch)
tree89b5dd3652f1f77dbfd6819023ee3843fcea8283 /waflib/extras/cython.py
parent914c4143592af494d70549ee614b578ab681450c (diff)
parent1c6fb2b3543d1229eadaa2af007383fbcf82289d (diff)
downloadserd-8c3d48d190cb73d73891ed704c84707d16c27272.tar.gz
serd-8c3d48d190cb73d73891ed704c84707d16c27272.tar.bz2
serd-8c3d48d190cb73d73891ed704c84707d16c27272.zip
Update autowaf and adapt to new API
Diffstat (limited to 'waflib/extras/cython.py')
-rw-r--r--waflib/extras/cython.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/waflib/extras/cython.py b/waflib/extras/cython.py
index 481d6f4c..591c274d 100644
--- a/waflib/extras/cython.py
+++ b/waflib/extras/cython.py
@@ -8,8 +8,9 @@ from waflib.TaskGen import extension
cy_api_pat = re.compile(r'\s*?cdef\s*?(public|api)\w*')
re_cyt = re.compile(r"""
- (?:from\s+(\w+)\s+)? # optionally match "from foo" and capture foo
- c?import\s(\w+|[*]) # require "import bar" and capture bar
+ ^\s* # must begin with some whitespace characters
+ (?:from\s+(\w+)(?:\.\w+)*\s+)? # optionally match "from foo(.baz)" and capture foo
+ c?import\s(\w+|[*]) # require "import bar" and capture bar
""", re.M | re.VERBOSE)
@extension('.pyx')
@@ -85,12 +86,12 @@ class cython(Task.Task):
node = self.inputs[0]
txt = node.read()
- mods = []
+ mods = set()
for m in re_cyt.finditer(txt):
if m.group(1): # matches "from foo import bar"
- mods.append(m.group(1))
+ mods.add(m.group(1))
else:
- mods.append(m.group(2))
+ mods.add(m.group(2))
Logs.debug('cython: mods %r', mods)
incs = getattr(self.generator, 'cython_includes', [])
@@ -99,7 +100,7 @@ class cython(Task.Task):
found = []
missing = []
- for x in mods:
+ for x in sorted(mods):
for y in incs:
k = y.find_resource(x + '.pxd')
if k: