[PATCH] keyword: fix pychecker warning about shadowed variable
Christian Ebert
blacktrash at gmx.net
Wed Feb 6 19:12:28 CST 2008
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1202346671 -3600
# Node ID 08b2daddeba4923890fac5305daeddbab765b820
# Parent 9bdd9438349556ac54010722c99c57d4e725289e
keyword: fix pychecker warning about shadowed variable
Also no underscore prefix for restricted switch inside reposetup.
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -116,11 +116,11 @@
'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
}
- def __init__(self, ui, repo, inc, exc, restricted):
+ def __init__(self, ui, repo, inc, exc, restrict):
self.ui = ui
self.repo = repo
self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
- self.restricted = restricted
+ self.restrict = restrict
self.commitnode = None
self.path = ''
@@ -159,7 +159,7 @@
def expand(self, node, data):
'''Returns data with keywords expanded.'''
- if self.restricted or util.binary(data):
+ if self.restrict or util.binary(data):
return data
return self.substitute(node, data, self.re_kw.sub)
@@ -436,8 +436,8 @@
return
global _kwtemplater
- _restricted = hgcmd in restricted.split()
- _kwtemplater = kwtemplater(ui, repo, inc, exc, _restricted)
+ restrict = hgcmd in restricted.split()
+ _kwtemplater = kwtemplater(ui, repo, inc, exc, restrict)
class kwrepo(repo.__class__):
def file(self, f, kwmatch=False):
@@ -449,7 +449,7 @@
def wread(self, filename):
data = super(kwrepo, self).wread(filename)
- if _restricted and _kwtemplater.matcher(filename):
+ if restrict and _kwtemplater.matcher(filename):
return _kwtemplater.shrink(data)
return data
More information about the Mercurial-devel
mailing list