Author: asterix Date: 2008-04-21 16:18:19 +0200 (Mon, 21 Apr 2008) New Revision: 9514
Modified: trunk/src/common/caps.py Log: fix static variable usage
Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-04-21 14:16:20 UTC (rev 9513) +++ trunk/src/common/caps.py 2008-04-21 14:18:19 UTC (rev 9514) @@ -80,11 +80,6 @@ def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' # our containers: - # __names is a string cache; every string long enough is given - # another object, and we will have plenty of identical long - # strings. therefore we can cache them - # TODO: maybe put all known xmpp namespace strings here - # (strings given in xmpppy)? # __cache is a dictionary mapping: pair of node and version maps # to CapsCacheItem object # __CacheItem is a class that stores data about particular @@ -93,7 +88,12 @@
class CacheItem(object): ''' TODO: logging data into db ''' - self.__names = {} + # __names is a string cache; every string long enough is given + # another object, and we will have plenty of identical long + # strings. therefore we can cache them + # TODO: maybe put all known xmpp namespace strings here + # (strings given in xmpppy)? + __names = {} def __init__(ciself, hash_method, hash): # cached into db ciself.hash_method = hash_method @@ -113,7 +113,7 @@ def _set_features(ciself, value): ciself._features = [] for feature in value: - ciself._features.append(self.__names.setdefault(feature, + ciself._features.append(ciself.__names.setdefault(feature, feature)) features = property(_get_features, _set_features)
@@ -122,7 +122,7 @@ def _set_identities(ciself, value): ciself._identities = [] for identity in value: - ciself._identities.append(self.__names.setdefault(identity, + ciself._identities.append(ciself.__names.setdefault(identity, identity)) identities = property(_get_identities, _set_identities)