[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: use the in operator instead of has_key()
Marius Gedminas
cvs-admin at zope.org
Thu Feb 7 16:02:53 UTC 2013
Log message for revision 129173:
Towards Py3K: use the in operator instead of has_key()
Changed:
U zope.tal/trunk/src/zope/tal/dummyengine.py
U zope.tal/trunk/src/zope/tal/talgenerator.py
-=-
Modified: zope.tal/trunk/src/zope/tal/dummyengine.py
===================================================================
--- zope.tal/trunk/src/zope/tal/dummyengine.py 2013-02-07 16:02:50 UTC (rev 129172)
+++ zope.tal/trunk/src/zope/tal/dummyengine.py 2013-02-07 16:02:52 UTC (rev 129173)
@@ -101,7 +101,7 @@
if type == "not":
return not self.evaluate(expr)
if type == "exists":
- return self.locals.has_key(expr) or self.globals.has_key(expr)
+ return expr in self.locals or expr in self.globals
if type == "python":
try:
return eval(expr, self.globals, self.locals)
@@ -120,9 +120,9 @@
# implementation; can be overridden
def evaluatePathOrVar(self, expr):
expr = expr.strip()
- if self.locals.has_key(expr):
+ if expr in self.locals:
return self.locals[expr]
- elif self.globals.has_key(expr):
+ elif expr in self.globals:
return self.globals[expr]
else:
raise TALExpressionError("unknown variable: %s" % repr(expr))
@@ -265,7 +265,7 @@
msgids = {}
def appendMsgid(self, domain, data):
- if not self.msgids.has_key(domain):
+ if domain not in self.msgids:
self.msgids[domain] = []
self.msgids[domain].append(data)
Modified: zope.tal/trunk/src/zope/tal/talgenerator.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgenerator.py 2013-02-07 16:02:50 UTC (rev 129172)
+++ zope.tal/trunk/src/zope/tal/talgenerator.py 2013-02-07 16:02:52 UTC (rev 129173)
@@ -346,7 +346,7 @@
def emitDefineMacro(self, macroName):
program = self.popProgram()
macroName = macroName.strip()
- if self.macros.has_key(macroName):
+ if macroName in self.macros:
raise METALError("duplicate macro definition: %s" % repr(macroName),
self.position)
if not re.match('%s$' % NAME_RE, macroName):
@@ -381,7 +381,7 @@
def emitFillSlot(self, slotName):
program = self.popProgram()
slotName = slotName.strip()
- if self.slots.has_key(slotName):
+ if slotName in self.slots:
raise METALError("duplicate fill-slot name: %s" % repr(slotName),
self.position)
if not re.match('%s$' % NAME_RE, slotName):
@@ -449,7 +449,7 @@
newlist = []
for item in attrlist:
key = item[0]
- if repldict.has_key(key):
+ if key in repldict:
expr, xlat, msgid = repldict[key]
item = item[:2] + ("replace", expr, xlat, msgid)
del repldict[key]
More information about the checkins
mailing list