python3: dict.has_key("key") --> "key" in dict

This commit is contained in:
looooo
2017-01-19 17:37:31 +01:00
committed by Yorik van Havre
parent 7c15e1407f
commit e9b5722220
10 changed files with 21 additions and 20 deletions

View File

@@ -107,11 +107,11 @@ class SimpleParser:
for i in self._p21loader._instances_definition.keys():
#print i
if not self.instanceMape.has_key(i):
if i not in self.instanceMape:
self._create_entity_instance(i)
def _create_entity_instance(self, instance_id):
if self._p21loader._instances_definition.has_key(instance_id):
if instance_id in self._p21loader._instances_definition:
instance_definition = self._p21loader._instances_definition[instance_id]
#print "Instance definition to process",instance_definition
# first find class name
@@ -144,11 +144,11 @@ class SimpleParser:
elif i[0] == '#':
key = int(i[1:])
#print 'Item: ',int(i[1:])
if self.instanceMape.has_key(key):
if key in self.instanceMape:
attrList[n] = self.instanceMape[key]
else:
self._create_entity_instance(key)
if not self.instanceMape.has_key(key):
if key not in self.instanceMape:
raise NameError("Needed instance not instanciated: ",key)
else:
attrList[n] = self.instanceMape[key]