summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2013-04-17 08:35:40 +0200
committerStefan Behnel <stefan_ml@behnel.de>2013-04-17 08:35:40 +0200
commit0ee15b1829125b6844ac13f437c2d9bd61a4ceca (patch)
tree60a823afafe0ee7256676799c3b01ffb68d73f15
parent88c8b9a68af51fb638e116767717f3c56faa9837 (diff)
downloadcython-0ee15b1829125b6844ac13f437c2d9bd61a4ceca.tar.gz
minor code cleanups0.19rc1
-rw-r--r--Cython/Build/Dependencies.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
index 466cb76e1..3c04f72be 100644
--- a/Cython/Build/Dependencies.py
+++ b/Cython/Build/Dependencies.py
@@ -309,11 +309,12 @@ def resolve_depends(depends, include_dirs):
@cached_function
def resolve_depend(depend, include_dirs):
if depend[0] == '<' and depend[-1] == '>':
- return
+ return None
for dir in include_dirs:
path = join_path(dir, depend)
if path_exists(path):
return os.path.normpath(path)
+ return None
@cached_function
def parse_dependencies(source_filename):
@@ -481,7 +482,7 @@ class DependencyTree(object):
externs = self.cimports_and_externs(filename)[1]
if externs:
if 'depends' in info.values:
- info.values['depends'] = list(set(info.values['depends']).union(set(externs)))
+ info.values['depends'] = list(set(info.values['depends']).union(externs))
else:
info.values['depends'] = list(externs)
return info