From 334f5b69c08cc7b3f60f963a689987412db2e635 Mon Sep 17 00:00:00 2001 From: Hanno Schlichting Date: Thu, 16 Jul 2009 16:57:09 +0200 Subject: Apply patch from pjenvey. Closes #3. --HG-- branch : distribute extra : rebase_source : 3a61d0692c74559b140c179dcc5f4ac4905bb982 --- setuptools/command/easy_install.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'setuptools/command/easy_install.py') 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 -- cgit v1.2.3