[PATCH 3 of 7] explicitly close files
Dan Villiom Podlaski Christiansen
danchr at gmail.com
Tue Dec 7 10:26:41 CST 2010
# HG changeset patch
# User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
# Date 1291739152 -3600
# Node ID f0719f33fe4730bf728b326ab341b1b578a5054f
# Parent 255cfd26b031953721ac0d41d25203b304e61c2f
explicitly close files
Add missing calls to close() to many places where files are
opened. Relying on reference counting to catch them soon-ish is not
portable and fails in environments with a proper GC, such as PyPy.
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -246,7 +246,9 @@ def checkfile(f, logfunc=_defaultlogger.
fc = 0
if not re.match(match, f):
continue
- pre = post = open(f).read()
+ fp = open(f)
+ pre = post = fp.read()
+ fp.close()
if "no-" + "check-code" in pre:
break
for p, r in filters:
diff --git a/hgext/gpg.py b/hgext/gpg.py
--- a/hgext/gpg.py
+++ b/hgext/gpg.py
@@ -244,7 +244,9 @@ def sign(ui, repo, *revs, **opts):
"(please commit .hgsigs manually "
"or use --force)"))
- repo.wfile(".hgsigs", "ab").write(sigmessage)
+ sigsfile = repo.wfile(".hgsigs", "ab")
+ sigsfile.write(sigmessage)
+ sigsfile.close()
if '.hgsigs' not in repo.dirstate:
repo[None].add([".hgsigs"])
diff --git a/hgext/inotify/linux/__init__.py b/hgext/inotify/linux/__init__.py
--- a/hgext/inotify/linux/__init__.py
+++ b/hgext/inotify/linux/__init__.py
@@ -26,7 +26,10 @@ procfs_path = '/proc/sys/fs/inotify'
def _read_procfs_value(name):
def read_value():
try:
- return int(open(procfs_path + '/' + name).read())
+ fp = open(procfs_path + '/' + name)
+ r = int(fp.read())
+ fp.close()
+ return r
except OSError:
return None
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -239,6 +239,7 @@ class queue(object):
try:
fh = open(os.path.join(path, 'patches.queue'))
cur = fh.read().rstrip()
+ fh.close()
if not cur:
curpath = os.path.join(path, 'patches')
else:
@@ -1754,7 +1755,9 @@ class queue(object):
_('need --name to import a patch from -'))
text = sys.stdin.read()
else:
- text = url.open(self.ui, filename).read()
+ fp = url.open(self.ui, filename)
+ text = fp.read()
+ fp.close()
except (OSError, IOError):
raise util.Abort(_("unable to read file %s") % filename)
if not patchname:
@@ -1763,6 +1766,7 @@ class queue(object):
checkfile(patchname)
patchf = self.opener(patchname, "w")
patchf.write(text)
+ patchf.close()
if not force:
checkseries(patchname)
if patchname not in self.series:
@@ -2760,6 +2764,7 @@ def qqueue(ui, repo, name=None, **opts):
try:
fh = repo.opener(_allqueues, 'r')
queues = [queue.strip() for queue in fh if queue.strip()]
+ fh.close()
if current not in queues:
queues.append(current)
except IOError:
diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -258,7 +258,10 @@ def patchbomb(ui, repo, *revs, **opts):
tmpfn = os.path.join(tmpdir, 'bundle')
try:
commands.bundle(ui, repo, tmpfn, dest, **opts)
- return open(tmpfn, 'rb').read()
+ fp = open(tmpfn, 'rb')
+ data = fp.read()
+ fp.close()
+ return data
finally:
try:
os.unlink(tmpfn)
diff --git a/mercurial/archival.py b/mercurial/archival.py
--- a/mercurial/archival.py
+++ b/mercurial/archival.py
@@ -82,6 +82,7 @@ class tarit(object):
def __init__(self, dest, mtime, kind=''):
self.mtime = mtime
+ self.fileobj = None
def taropen(name, mode, fileobj=None):
if kind == 'gz':
@@ -91,8 +92,10 @@ class tarit(object):
gzfileobj = self.GzipFileWithTime(name, mode + 'b',
zlib.Z_BEST_COMPRESSION,
fileobj, timestamp=mtime)
+ self.fileobj = gzfileobj
return tarfile.TarFile.taropen(name, mode, gzfileobj)
else:
+ self.fileobj = fileobj
return tarfile.open(name, mode + kind, fileobj)
if isinstance(dest, str):
@@ -118,6 +121,8 @@ class tarit(object):
def done(self):
self.z.close()
+ if self.fileobj:
+ self.fileobj.close()
class tellable(object):
'''provide tell method for zipfile.ZipFile when writing to http
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -679,7 +679,9 @@ def export(repo, revs, template='hg-%h.p
parents.reverse()
prev = (parents and parents[0]) or nullid
+ shouldclose = False
if not fp:
+ shouldclose = True
fp = make_file(repo, template, node, total=total, seqno=seqno,
revwidth=revwidth, mode='ab')
if fp != sys.stdout and hasattr(fp, 'name'):
@@ -700,7 +702,8 @@ def export(repo, revs, template='hg-%h.p
for chunk in patch.diff(repo, prev, node, opts=opts):
fp.write(chunk)
- fp.flush()
+ if shouldclose:
+ fp.close()
for seqno, rev in enumerate(revs):
single(rev, seqno + 1, fp)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -660,6 +660,7 @@ def cat(ui, repo, file1, *pats, **opts):
if opts.get('decode'):
data = repo.wwritedata(abs, data)
fp.write(data)
+ fp.close()
err = 0
return err
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -80,7 +80,9 @@ class dirstate(object):
@propertycache
def _pl(self):
try:
- st = self._opener("dirstate").read(40)
+ fp = self._opener("dirstate")
+ st = fp.read(40)
+ fp.close()
l = len(st)
if l == 40:
return st[:20], st[20:40]
diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py
+++ b/mercurial/hgweb/common.py
@@ -119,7 +119,10 @@ def staticfile(directory, fname, req):
os.stat(path)
ct = mimetypes.guess_type(path)[0] or "text/plain"
req.respond(HTTP_OK, ct, length = os.path.getsize(path))
- return open(path, 'rb').read()
+ fp = open(path, 'rb')
+ data = fp.read()
+ fp.close()
+ return data
except TypeError:
raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')
except OSError, err:
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -276,6 +276,8 @@ class localrepository(repo.repository):
# committed tags are stored in UTF-8
writetags(fp, names, encoding.fromlocal, prevtags)
+ fp.close()
+
if '.hgtags' not in self.dirstate:
self[None].add(['.hgtags'])
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -32,6 +32,7 @@ class mergestate(object):
else:
bits = l[:-1].split("\0")
self._state[bits[0]] = bits[1:]
+ f.close()
except IOError, err:
if err.errno != errno.ENOENT:
raise
@@ -42,6 +43,7 @@ class mergestate(object):
f.write(hex(self._local) + "\n")
for d, v in self._state.iteritems():
f.write("\0".join([d] + v) + "\n")
+ f.close()
self._dirty = False
def add(self, fcl, fco, fca, fd, flags):
hash = util.sha1(fcl.path()).hexdigest()
@@ -67,6 +69,7 @@ class mergestate(object):
state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]
f = self._repo.opener("merge/" + hash)
self._repo.wwrite(dfile, f.read(), flags)
+ f.close()
fcd = wctx[dfile]
fco = octx[ofile]
fca = self._repo.filectx(afile, fileid=anode)
diff --git a/mercurial/posix.py b/mercurial/posix.py
--- a/mercurial/posix.py
+++ b/mercurial/posix.py
@@ -71,20 +71,26 @@ def set_flags(f, l, x):
if l:
if not stat.S_ISLNK(s):
# switch file to link
- data = open(f).read()
+ fp = open(f)
+ data = fp.read()
+ fp.close()
os.unlink(f)
try:
os.symlink(data, f)
except:
# failed to make a link, rewrite file
- open(f, "w").write(data)
+ fp = open(f, "w")
+ fp.write(data)
+ fp.close()
# no chmod needed at this point
return
if stat.S_ISLNK(s):
# switch link to file
data = os.readlink(f)
os.unlink(f)
- open(f, "w").write(data)
+ fp = open(f, "w")
+ fp.write(data)
+ fp.close()
s = 0666 & ~umask # avoid restatting for chmod
sx = s & 0100
diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py
--- a/mercurial/statichttprepo.py
+++ b/mercurial/statichttprepo.py
@@ -99,7 +99,9 @@ class statichttprepository(localrepo.loc
raise
# check if it is a non-empty old-style repository
try:
- self.opener("00changelog.i").read(1)
+ fp = self.opener("00changelog.i")
+ fp.read(1)
+ fp.close()
except IOError, inst:
if inst.errno != errno.ENOENT:
raise
diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -27,13 +27,17 @@ def _playback(journal, report, opener, e
for f, o, ignore in entries:
if o or not unlink:
try:
- opener(f, 'a').truncate(o)
+ fp = opener(f, 'a')
+ fp.truncate(o)
+ fp.close()
except IOError:
report(_("failed to truncate %s\n") % f)
raise
else:
try:
- fn = opener(f).name
+ fp = opener(f)
+ fn = fp.name
+ fp.close()
os.unlink(fn)
except (IOError, OSError), inst:
if inst.errno != errno.ENOENT:
@@ -169,7 +173,10 @@ class transaction(object):
def rollback(opener, file, report):
entries = []
- for l in open(file).readlines():
+ fp = open(file)
+ lines = fp.readlines()
+ fp.close()
+ for l in lines:
f, o = l.split('\0')
entries.append((f, int(o), None))
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -198,7 +198,10 @@ def tempfilter(s, cmd):
if code:
raise Abort(_("command '%s' failed: %s") %
(cmd, explain_exit(code)))
- return open(outname, 'rb').read()
+ fp = open(outname, 'rb')
+ r = fp.read()
+ fp.close()
+ return r
finally:
try:
if inname:
@@ -598,7 +601,10 @@ def readlock(pathname):
raise
except AttributeError: # no symlink in os
pass
- return posixfile(pathname).read()
+ fp = posixfile(pathname)
+ r = fp.read()
+ fp.close()
+ return r
def fstat(fp):
'''stat file object that may not have fileno method.'''
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -294,14 +294,18 @@ class hginstallscripts(install_scripts):
libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common):]
for outfile in self.outfiles:
- data = open(outfile, 'rb').read()
+ fp = open(outfile, 'rb')
+ data = fp.read()
+ fp.close()
# skip binary files
if '\0' in data:
continue
data = data.replace('@LIBDIR@', libdir.encode('string_escape'))
- open(outfile, 'wb').write(data)
+ fp = open(outfile, 'wb')
+ fp.write(data)
+ fp.close()
cmdclass = {'build_mo': hgbuildmo,
'build_ext': hgbuildext,
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -231,6 +231,8 @@ def parseargs():
if line and not line.startswith('#'):
blacklist[line] = filename
+ f.close()
+
options.blacklist = blacklist
return (options, args)
@@ -491,6 +493,8 @@ def tsttest(test, options, replacements)
# non-command/result - queue up for merged output
after.setdefault(pos, []).append(l)
+ t.close()
+
script.append('echo %s %s $?\n' % (salt, n + 1))
fd, name = tempfile.mkstemp(suffix='hg-tst')
@@ -926,7 +930,9 @@ def runtests(options, tests):
continue
if options.keywords:
- t = open(test).read().lower() + test.lower()
+ fp = open(test)
+ t = fp.read().lower() + test.lower()
+ fp.close()
for k in options.keywords.lower().split():
if k in t:
break
More information about the Mercurial-devel
mailing list