Commit 9adb6d40 authored by Reinout van Rees's avatar Reinout van Rees

Added with..open for 2 files that are read plus an extra check

parent 999057b1
...@@ -904,15 +904,21 @@ def _detect_distutils_scripts(directory): ...@@ -904,15 +904,21 @@ def _detect_distutils_scripts(directory):
marker = 'EASY-INSTALL-DEV-SCRIPT' marker = 'EASY-INSTALL-DEV-SCRIPT'
scripts_found = [] scripts_found = []
for filename in dir_contents: for filename in dir_contents:
dev_script_content = open(os.path.join(directory, filename)).read() filepath = os.path.join(directory, filename)
if not os.path.isfile(filepath):
continue
with open(filepath) as fp:
dev_script_content = fp.read()
if marker in dev_script_content: if marker in dev_script_content:
# The distutils bin script points at the actual file we need. # The distutils bin script points at the actual file we need.
for line in dev_script_content.splitlines(): for line in dev_script_content.splitlines():
match = DUNDER_FILE_PATTERN.search(line) match = DUNDER_FILE_PATTERN.search(line)
if match: if match:
# The ``__file__ =`` line in the generated script points
# at the actual distutils script we need.
actual_script_filename = match.group('filename') actual_script_filename = match.group('filename')
actual_script_content = open( with open(actual_script_filename) as fp:
actual_script_filename).read() actual_script_content = fp.read()
scripts_found.append([filename, actual_script_content]) scripts_found.append([filename, actual_script_content])
if scripts_found: if scripts_found:
......
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