mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#4578: fix has_key() usage in compiler package.

Browse source
This commit is contained in:
Georg Brandl 2008-12-15 08:58:59 +00:00
parent cbc1ed5e28
commit 2d2fe572a4
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
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,13 @@ 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 +107,7 @@ 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 name not in self.defs and name not in self.globals:
free[name] = 1
return free.keys()
@ -134,7 +132,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: