[PATCH 2 of 7] cleanup: avoid _ for local unused tmp variables - that is reserved for i18n
Mads Kiilerich
mads at kiilerich.com
Fri Aug 15 14:21:18 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1408112447 -7200
# Fri Aug 15 16:20:47 2014 +0200
# Node ID 3e2392e264d2aef3ea26ae9d809d2f4e5eeba699
# Parent 53b0e3a724f24a0858837e1b4cb1742615a36836
cleanup: avoid _ for local unused tmp variables - that is reserved for i18n
_ is usually used for i18n markup but we also used it for I-don't-care
variables.
Instead, name don't-care variables in a slightly descriptive way but use the _
prefix to designate unused variable.
This will mute some pyflakes "import '_' ... shadowed by loop variable"
warnings.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -269,7 +269,7 @@ def cleanupcmd(ui, repo):
wlock = None
try:
wlock = repo.wlock()
- for (name, _) in repo.vfs.readdir('shelved'):
+ for (name, _type) in repo.vfs.readdir('shelved'):
suffix = name.rsplit('.', 1)[-1]
if suffix in ('hg', 'files', 'patch'):
shelvedfile(repo, name).unlink()
@@ -303,7 +303,7 @@ def listshelves(repo):
raise
return []
info = []
- for (name, _) in names:
+ for (name, _type) in names:
pfx, sfx = name.rsplit('.', 1)
if not pfx or sfx != 'patch':
continue
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -1069,7 +1069,7 @@ def help(web, req, tmpl):
topicname = req.form.get('node', [None])[0]
if not topicname:
def topics(**map):
- for entries, summary, _ in helpmod.helptable:
+ for entries, summary, _doc in helpmod.helptable:
yield {'topic': entries[0], 'summary': summary}
early, other = [], []
diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -115,10 +115,10 @@ class transaction(object):
offsets = []
backups = []
- for f, o, _ in q[0]:
+ for f, o, _data in q[0]:
offsets.append((f, o))
- for f, b, _ in q[1]:
+ for f, b, _data in q[1]:
backups.append((f, b))
d = ''.join(['%s\0%d\n' % (f, o) for f, o in offsets])
@@ -265,7 +265,7 @@ class transaction(object):
self.opener.unlink(self.journal)
if self.opener.isfile(self.backupjournal):
self.opener.unlink(self.backupjournal)
- for f, b, _ in self.backupentries:
+ for f, b, _ignore in self.backupentries:
self.opener.unlink(b)
self.backupentries = []
self.journal = None
diff --git a/mercurial/worker.py b/mercurial/worker.py
--- a/mercurial/worker.py
+++ b/mercurial/worker.py
@@ -105,7 +105,7 @@ def _posixworker(ui, func, staticargs, a
if err.errno != errno.ESRCH:
raise
def waitforworkers():
- for _ in pids:
+ for _pid in pids:
st = _exitstatus(os.wait()[1])
if st and not problem[0]:
problem[0] = st
More information about the Mercurial-devel
mailing list