diff options
| -rw-r--r-- | pkg_resources.py | 5 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 12 | ||||
| -rwxr-xr-x | setuptools/command/egg_info.py | 1 | ||||
| -rwxr-xr-x | setuptools/command/upload.py | 4 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 9edb6c0b..24b91902 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1453,7 +1453,10 @@ class FileMetadata(EmptyProvider): def get_metadata(self,name): if name=='PKG-INFO': - return open(self.path,'rU').read() + f = open(self.path,'rU') + metadata = f.read() + f.close() + return metadata raise KeyError("No metadata except PKG-INFO is available") def get_metadata_lines(self,name): diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index f06b6ddd..2289b1d5 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -781,7 +781,9 @@ Please make the appropriate changes for your system and try again. if locals()[name]: txt = os.path.join(egg_tmp, 'EGG-INFO', name+'.txt') if not os.path.exists(txt): - open(txt,'w').write('\n'.join(locals()[name])+'\n') + f = open(txt,'w') + f.write('\n'.join(locals()[name])+'\n') + f.close() def check_conflicts(self, dist): """Verify that there are no conflicting "old-style" packages""" @@ -1076,7 +1078,9 @@ Please make the appropriate changes for your system and try again.""" % ( if os.path.exists(sitepy): log.debug("Checking existing site.py in %s", self.install_dir) - current = open(sitepy,'rb').read() + f = open(sitepy,'rb') + current = f.read() + f.close() if not current.startswith('def __boot():'): raise DistutilsError( "%s is not a setuptools-generated site.py; please" @@ -1327,7 +1331,8 @@ class PthDistributions(Environment): saw_import = False seen = dict.fromkeys(self.sitedirs) if os.path.isfile(self.filename): - for line in open(self.filename,'rt'): + f = open(self.filename,'rt') + for line in f: if line.startswith('import'): saw_import = True continue @@ -1345,6 +1350,7 @@ class PthDistributions(Environment): self.dirty = True # we cleaned up, so we're dirty now :) continue seen[path] = 1 + f.close() if self.paths and not saw_import: self.dirty = True # ensure anything we touch has import wrappers diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index b14a78b0..a8315d23 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -444,6 +444,7 @@ def get_pkg_info_revision(): match = re.match(r"Version:.*-r(\d+)\s*$", line) if match: return int(match.group(1)) + f.close() return 0 diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 7ac08c22..1f49745e 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -83,7 +83,9 @@ class upload(Command): dry_run=self.dry_run) # Fill in the data - content = open(filename,'rb').read() + f = open(filename,'rb') + content = f.read() + f.close() basename = os.path.basename(filename) comment = '' if command=='bdist_egg' and self.distribution.has_ext_modules(): diff --git a/setuptools/package_index.py b/setuptools/package_index.py index da3fed12..8321eece 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -749,7 +749,9 @@ def local_open(url): files = [] for f in os.listdir(filename): if f=='index.html': - body = open(os.path.join(filename,f),'rb').read() + fp = open(os.path.join(filename,f),'rb') + body = fp.read() + fp.close() break elif os.path.isdir(os.path.join(filename,f)): f+='/' |