grp/Wii.py
1
Fork 0
mirror of https://github.com/grp/Wii.py.git synced 2025-06-18 23:05:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoiding storing twice the key names, we can get them from the dictionary

Browse Source
This commit is contained in:
Giuseppe (LemonBoy) 2009-06-22 08:53:01 +02:00
parent 7f2da84dfb
commit 2b65473b78
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
formats.py
View File

@ -13,7 +13,6 @@ class CONF:
def __init__(self, f): def __init__(self, f):
self.conf = '' self.conf = ''
self.keys = {} self.keys = {}
self.keyNames = []
self.lastKeyOffset = 0 self.lastKeyOffset = 0
self.totalKeys = 0 self.totalKeys = 0
@ -36,7 +35,6 @@ class CONF:
keyName = keys[x].split('=')[0] keyName = keys[x].split('=')[0]
keyVal = keys[x].split('=')[1] keyVal = keys[x].split('=')[1]
self.keyNames.append(keyName)
self.keys[keyName] = keyVal self.keys[keyName] = keyVal
def getKeysCount(self): def getKeysCount(self):
@ -45,7 +43,7 @@ class CONF:
def getKeysName(self): def getKeysName(self):
"""Returns the list of key names.""" """Returns the list of key names."""
return self.keyNames return self.keys.keys()
def getKeyValue(self, key): def getKeyValue(self, key):
"""Returns the value of the key ``key''.""" """Returns the value of the key ``key''."""
@ -74,11 +72,7 @@ class CONF:
self.lastKeyOffset = self.conf.rfind('\r\n') + 2 self.lastKeyOffset = self.conf.rfind('\r\n') + 2
def keyExist(self, key): def keyExist(self, key):
"""Returns 1 if key ``key'' exists, 0 otherwise.""" return self.keys.has_key(key.upper())
if self.getKeyValue(key.upper()) != 'Key not found':
return 0
else:
return 1
def addKey(self, key, value): def addKey(self, key, value):
"""Adds key ``key'' with value ``value'' to the list.""" """Adds key ``key'' with value ``value'' to the list."""
@ -88,7 +82,6 @@ class CONF:
return -2 return -2
self.keys[key.upper()] = value.upper() self.keys[key.upper()] = value.upper()
self.keyNames.append(key.upper())
self.totalKeys +=1 self.totalKeys +=1
self.conf = self.conf[:self.lastKeyOffset] + key.upper() + '=' + value.upper() + '\r\n' self.conf = self.conf[:self.lastKeyOffset] + key.upper() + '=' + value.upper() + '\r\n'
@ -112,7 +105,6 @@ class CONF:
"""Deletes the key ``key''.""" """Deletes the key ``key''."""
try: try:
del self.keys[key.upper()] del self.keys[key.upper()]
self.keyNames.remove(key.upper())
self.totalKeys -=1 self.totalKeys -=1
self.conf = '' self.conf = ''
@ -138,7 +130,6 @@ class CONF:
for key in self.keys.keys(): for key in self.keys.keys():
if self.keys.get(key) == value: if self.keys.get(key) == value:
del self.keys[key] del self.keys[key]
self.keyNames.remove(key)
self.totalKeys -=1 self.totalKeys -=1