Commit c4c23b17 authored by Dr Alex Meakins's avatar Dr Alex Meakins

Made changes highlighted by code review,

parent e86f7378
...@@ -147,16 +147,16 @@ def find_root_package_dir(file_path): ...@@ -147,16 +147,16 @@ def find_root_package_dir(file_path):
@cached_function @cached_function
def check_package_dir(dir, package_names): def check_package_dir(dir_path, package_names):
namespace = True namespace = True
for dirname in package_names: for dirname in package_names:
dir = os.path.join(dir, dirname) dir_path = os.path.join(dir_path, dirname)
has_init = contains_init(dir) has_init = contains_init(dir_path)
if not namespace and not has_init: if not namespace and not has_init:
return None, False return None, False
elif has_init: elif has_init:
namespace = False namespace = False
return dir, namespace return dir_path, namespace
@cached_function @cached_function
...@@ -167,7 +167,6 @@ def contains_init(dir_path): ...@@ -167,7 +167,6 @@ def contains_init(dir_path):
return 1 return 1
@cached_function
def is_package_dir(dir_path): def is_package_dir(dir_path):
if contains_init(dir_path): if contains_init(dir_path):
return 1 return 1
......
...@@ -428,6 +428,7 @@ VER_DEP_MODULES = { ...@@ -428,6 +428,7 @@ VER_DEP_MODULES = {
'run.special_methods_T561_py2', 'run.special_methods_T561_py2',
]), ]),
(3,3) : (operator.lt, lambda x: x in ['build.package_compilation', (3,3) : (operator.lt, lambda x: x in ['build.package_compilation',
'build.cythonize_pep420_namespace',
'run.yield_from_py33', 'run.yield_from_py33',
'pyximport.pyximport_namespace', 'pyximport.pyximport_namespace',
'run.qualname', 'run.qualname',
......
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