[PATCH 7 of 8 v2] cleanup: replace naked excepts with except Exception:
Brodie Rao
brodie at sf.io
Sat May 12 09:03:23 CDT 2012
# HG changeset patch
# User Brodie Rao <brodie at sf.io>
# Date 1336831366 -7200
# Node ID 894fff577e3c2a55e803b08f96741a6f94d1f323
# Parent 33e3b4815404f0bb2b696046773621d2942a5cee
cleanup: replace naked excepts with except Exception: ...
diff --git a/contrib/perf.py b/contrib/perf.py
--- a/contrib/perf.py
+++ b/contrib/perf.py
@@ -33,11 +33,11 @@ def perfwalk(ui, repo, *pats):
try:
m = scmutil.match(repo[None], pats, {})
timer(lambda: len(list(repo.dirstate.walk(m, [], True, False))))
- except:
+ except Exception:
try:
m = scmutil.match(repo[None], pats, {})
timer(lambda: len([b for a, b, c in repo.dirstate.statwalk([], m)]))
- except:
+ except Exception:
timer(lambda: len(list(cmdutil.walk(repo, pats, {}))))
def perfstatus(ui, repo, *pats):
diff --git a/contrib/setup3k.py b/contrib/setup3k.py
--- a/contrib/setup3k.py
+++ b/contrib/setup3k.py
@@ -84,7 +84,7 @@ def hasfunction(cc, funcname):
os.dup2(devnull.fileno(), sys.stderr.fileno())
objects = cc.compile([fname], output_dir=tmpdir)
cc.link_executable(objects, os.path.join(tmpdir, "a.out"))
- except:
+ except Exception:
return False
return True
finally:
diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -72,7 +72,7 @@ class bzr_source(converter_source):
self.ui.warn(_('warning: lightweight checkouts may cause '
'conversion failures, try with a regular '
'branch instead.\n'))
- except:
+ except Exception:
self.ui.note(_('bzr source type could not be determined\n'))
def before(self):
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -462,7 +462,7 @@ def convert(ui, src, dest=None, revmapfi
if not revmapfile:
try:
revmapfile = destc.revmapfile()
- except:
+ except Exception:
revmapfile = os.path.join(destc, "map")
c = converter(ui, srcc, destc, revmapfile, opts)
diff --git a/hgext/convert/git.py b/hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -211,7 +211,7 @@ class convert_git(converter_source):
continue
name = '%s%s' % (reftype, name[prefixlen:])
bookmarks[name] = rev
- except:
+ except Exception:
pass
return bookmarks
diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -95,7 +95,7 @@ class mercurial_sink(converter_sink):
self.after()
try:
self.repo = hg.repository(self.ui, branchpath)
- except:
+ except Exception:
self.repo = hg.repository(self.ui, branchpath, create=True)
self.before()
@@ -105,7 +105,7 @@ class mercurial_sink(converter_sink):
for b in pbranches:
try:
self.repo.lookup(b[0])
- except:
+ except Exception:
missings.setdefault(b[1], []).append(b[0])
if missings:
@@ -192,7 +192,7 @@ class mercurial_sink(converter_sink):
try:
oldlines = sorted(parentctx['.hgtags'].data().splitlines(True))
- except:
+ except Exception:
oldlines = []
newlines = sorted([("%s %s\n" % (tags[tag], tag)) for tag in tags])
diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -286,7 +286,7 @@ class monotone_source(converter_source,
raise IOError # file was deleted or renamed
try:
data = self.mtnrun("get_file_of", name, r=rev)
- except:
+ except Exception:
raise IOError # file was deleted or renamed
self.mtnloadmanifest(rev)
node, attr = self.files.get(name, (None, ""))
diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -176,7 +176,7 @@ def httpcheck(ui, path, proto):
'know better.\n'))
return True
data = inst.fp.read()
- except:
+ except Exception:
# Could be urllib2.URLError if the URL is invalid or anything else.
return False
return '<m:human-readable errcode="160013">' in data
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -613,7 +613,7 @@ class queue(object):
raise util.Abort(_("repo commit failed"))
try:
ph = patchheader(mergeq.join(patch), self.plainmode)
- except:
+ except Exception:
raise util.Abort(_("unable to read %s") % patch)
diffopts = self.patchopts(diffopts, patch)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1917,7 +1917,7 @@ def debugindex(ui, repo, file_ = None, *
if format == 0:
try:
pp = r.parents(node)
- except:
+ except Exception:
pp = [nullid, nullid]
ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
i, r.start(i), r.length(i), base, r.linkrev(i),
diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -164,7 +164,7 @@ class transaction(object):
_playback(self.journal, self.report, self.opener,
self.entries, False)
self.report(_("rollback completed\n"))
- except:
+ except Exception:
self.report(_("rollback failed - please run hg recover\n"))
finally:
self.journal = None
diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -87,7 +87,7 @@ def _verify(repo):
# attempt to filter down to real linkrevs
linkrevs = [l for l in linkrevs
if lrugetctx(l)[f].filenode() == node]
- except:
+ except Exception:
pass
warn(_(" (expected %s)") % " ".join(map(str, linkrevs)))
lr = None # can't be trusted
@@ -189,7 +189,7 @@ def _verify(repo):
try:
fl = repo.file(f)
lr = min([fl.linkrev(fl.rev(n)) for n in filenodes[f]])
- except:
+ except Exception:
lr = None
err(lr, _("in manifest but not in changeset"), f)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,7 @@ def hasfunction(cc, funcname):
os.dup2(devnull.fileno(), sys.stderr.fileno())
objects = cc.compile([fname], output_dir=tmpdir)
cc.link_executable(objects, os.path.join(tmpdir, "a.out"))
- except:
+ except Exception:
return False
return True
finally:
diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
--- a/tests/test-check-code-hg.t
+++ b/tests/test-check-code-hg.t
@@ -8,24 +8,9 @@
$ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!'
$ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true
- contrib/perf.py:0:
- > except:
- warning: naked except clause
- contrib/perf.py:0:
- > except:
- warning: naked except clause
- contrib/setup3k.py:0:
- > except:
- warning: naked except clause
contrib/shrink-revlog.py:0:
> except:
warning: naked except clause
- hgext/convert/bzr.py:0:
- > except:
- warning: naked except clause
- hgext/convert/convcmd.py:0:
- > except:
- warning: naked except clause
hgext/convert/cvsps.py:0:
> ui.write('Ancestors: %s\n' % (','.join(r)))
warning: unwrapped ui message
@@ -59,22 +44,6 @@
hgext/convert/cvsps.py:0:
> ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
warning: unwrapped ui message
- hgext/convert/git.py:0:
- > except:
- warning: naked except clause
- hgext/convert/hg.py:0:
- > except:
- warning: naked except clause
- warning: naked except clause
- hgext/convert/hg.py:0:
- > except:
- warning: naked except clause
- hgext/convert/monotone.py:0:
- > except:
- warning: naked except clause
- hgext/convert/subversion.py:0:
- > except:
- warning: naked except clause
hgext/hgk.py:0:
> ui.write("parent %s\n" % p)
warning: unwrapped ui message
@@ -109,9 +78,6 @@
warning: naked except clause
warning: naked except clause
hgext/mq.py:0:
- > except:
- warning: naked except clause
- hgext/mq.py:0:
> ui.write("mq: %s\n" % ', '.join(m))
warning: unwrapped ui message
hgext/patchbomb.py:0:
@@ -133,9 +99,6 @@
> ui.write("unpruned common: %s\n" % " ".join([short(n)
warning: unwrapped ui message
mercurial/commands.py:0:
- > except:
- warning: naked except clause
- mercurial/commands.py:0:
> ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
warning: unwrapped ui message
mercurial/commands.py:0:
@@ -238,21 +201,9 @@
mercurial/repair.py:0:
> except:
warning: naked except clause
- mercurial/transaction.py:0:
- > except:
- warning: naked except clause
mercurial/util.py:0:
> except:
warning: naked except clause
- mercurial/verify.py:0:
- > except:
- warning: naked except clause
- mercurial/verify.py:0:
- > except:
- warning: naked except clause
- setup.py:0:
- > except:
- warning: naked except clause
tests/autodiff.py:0:
> ui.write('data lost for: %s\n' % fn)
warning: unwrapped ui message
More information about the Mercurial-devel
mailing list