traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stomp out more hsa_key() calls.

This commit is contained in:
Guido van Rossum 2006-08-19 15:28:37 +00:00
parent 1b01e5c706
commit 49061f7b8f
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/compiler/misc.py
View File

@ -14,13 +14,13 @@ class Set:
def __len__(self):
return len(self.elts)
def __contains__(self, elt):
return self.elts.has_key(elt)
return elt in self.elts
def add(self, elt):
self.elts[elt] = elt
def elements(self):
return self.elts.keys()
def has_elt(self, elt):
return self.elts.has_key(elt)
return elt in self.elts
def remove(self, elt):
del self.elts[elt]
def copy(self):

6
Lib/compiler/pyassem.py
View File

@ -210,7 +210,7 @@ def dfs_postorder(b, seen):
order = []
seen[b] = b
for c in b.get_children():
if seen.has_key(c):
if c in seen:
continue
order = order + dfs_postorder(c, seen)
order.append(b)
@ -406,7 +406,7 @@ class PyFlowGraph(FlowGraph):
seen = {}
def max_depth(b, d):
if seen.has_key(b):
if b in seen:
return d
seen[b] = 1
d = d + depth[b]
@ -482,7 +482,7 @@ class PyFlowGraph(FlowGraph):
for name in self.cellvars:
cells[name] = 1
self.cellvars = [name for name in self.varnames
if cells.has_key(name)]
if name in cells]
for name in self.cellvars:
del cells[name]
self.cellvars = self.cellvars + cells.keys()

20
Lib/compiler/symbols.py
View File

@ -49,9 +49,9 @@ class Scope:
def add_global(self, name):
name = self.mangle(name)
if self.uses.has_key(name) or self.defs.has_key(name):
if name in self.uses or name in self.defs:
pass # XXX warn about global following def/use
if self.params.has_key(name):
if name in self.params:
raise SyntaxError, "%s in %s is global and parameter" % \
(name, self.name)
self.globals[name] = 1
@ -88,14 +88,14 @@ class Scope:
The scope of a name could be LOCAL, GLOBAL, FREE, or CELL.
"""
if self.globals.has_key(name):
if name in self.globals:
return SC_GLOBAL
if self.cells.has_key(name):
if name in self.cells:
return SC_CELL
if self.defs.has_key(name):
if name in self.defs:
return SC_LOCAL
if self.nested and (self.frees.has_key(name) or
self.uses.has_key(name)):
if self.nested and (name in self.frees or
name in self.uses):
return SC_FREE
if self.nested:
return SC_UNKNOWN
@ -108,8 +108,8 @@ class Scope:
free = {}
free.update(self.frees)
for name in self.uses.keys():
if not (self.defs.has_key(name) or
self.globals.has_key(name)):
if not (name in self.defs or
name in self.globals):
free[name] = 1
return free.keys()
@ -134,7 +134,7 @@ class Scope:
free.
"""
self.globals[name] = 1
if self.frees.has_key(name):
if name in self.frees:
del self.frees[name]
for child in self.children:
if child.check_name(name) == SC_FREE:

2
Lib/compiler/transformer.py
View File

@ -82,7 +82,7 @@ def extractLineNo(ast):
def Node(*args):
kind = args[0]
if nodes.has_key(kind):
if kind in nodes:
try:
return nodes[kind](*args[1:])
except TypeError:

2
Lib/compiler/visitor.py
View File

@ -84,7 +84,7 @@ class ExampleASTVisitor(ASTVisitor):
meth(node, *args)
elif self.VERBOSE > 0:
klass = node.__class__
if not self.examples.has_key(klass):
if klass not in self.examples:
self.examples[klass] = klass
print
print self.visitor

2
Lib/email/_parseaddr.py
View File

@ -109,7 +109,7 @@ def parsedate_tz(data):
return None
tzoffset = None
tz = tz.upper()
if _timezones.has_key(tz):
if tz in _timezones:
tzoffset = _timezones[tz]
else:
try:

14
Lib/email/message.py
View File

@ -245,16 +245,16 @@ class Message:
# BAW: should we accept strings that can serve as arguments to the
# Charset constructor?
self._charset = charset
if not self.has_key('MIME-Version'):
if 'MIME-Version' not in self:
self.add_header('MIME-Version', '1.0')
if not self.has_key('Content-Type'):
if 'Content-Type' not in self:
self.add_header('Content-Type', 'text/plain',
charset=charset.get_output_charset())
else:
self.set_param('charset', charset.get_output_charset())
if str(charset) <> charset.get_output_charset():
self._payload = charset.body_encode(self._payload)
if not self.has_key('Content-Transfer-Encoding'):
if 'Content-Transfer-Encoding' not in self:
cte = charset.get_body_encoding()
try:
cte(self)
@ -547,7 +547,7 @@ class Message:
VALUE item in the 3-tuple) is always unquoted, unless unquote is set
to False.
"""
if not self.has_key(header):
if header not in self:
return failobj
for k, v in self._get_params_preserve(failobj, header):
if k.lower() == param.lower():
@ -578,7 +578,7 @@ class Message:
if not isinstance(value, tuple) and charset:
value = (charset, language, value)
if not self.has_key(header) and header.lower() == 'content-type':
if header not in self and header.lower() == 'content-type':
ctype = 'text/plain'
else:
ctype = self.get(header)
@ -613,7 +613,7 @@ class Message:
False. Optional header specifies an alternative to the Content-Type
header.
"""
if not self.has_key(header):
if header not in self:
return
new_ctype = ''
for p, v in self.get_params(header=header, unquote=requote):
@ -649,7 +649,7 @@ class Message:
if header.lower() == 'content-type':
del self['mime-version']
self['MIME-Version'] = '1.0'
if not self.has_key(header):
if header not in self:
self[header] = type
return
params = self.get_params(header=header, unquote=requote)