diff options
| -rw-r--r-- | pkg_resources.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 2 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 4babb48e..d0e840b8 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1676,7 +1676,7 @@ def find_on_path(importer, path_item, only=False): for dist in find_distributions(os.path.join(path_item, entry)): yield dist elif not only and lower.endswith('.egg-link'): - for line in file(os.path.join(path_item, entry)): + for line in open(os.path.join(path_item, entry)): if not line.strip(): continue for item in find_distributions(os.path.join(path_item,line.rstrip())): yield item diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 32888056..5643c773 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -105,7 +105,7 @@ class develop(easy_install): def uninstall_link(self): if os.path.exists(self.egg_link): log.info("Removing %s (link to %s)", self.egg_link, self.egg_base) - contents = [line.rstrip() for line in file(self.egg_link)] + contents = [line.rstrip() for line in open(self.egg_link)] if contents not in ([self.egg_path], [self.egg_path, self.setup_path]): log.warn("Link points to %s: uninstall aborted", contents) return diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 084370d5..98799de5 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -241,7 +241,7 @@ class PackageIndex(Environment): self.scan_egg_link(item, entry) def scan_egg_link(self, path, entry): - lines = filter(None, map(str.strip, file(os.path.join(path, entry)))) + lines = filter(None, map(str.strip, open(os.path.join(path, entry)))) if len(lines)==2: for dist in find_distributions(os.path.join(path, lines[0])): dist.location = os.path.join(path, *lines) |