From dc48eeea96c8d2d5a53b13943368c40cfd271a5b Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 21 Apr 2008 14:18:19 +0000 Subject: [PATCH] fix static variable usage --- src/common/caps.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/caps.py b/src/common/caps.py index 9c24db8ee..c360739c2 100644 --- a/src/common/caps.py +++ b/src/common/caps.py @@ -80,11 +80,6 @@ class CapsCache(object): 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 CapsCache(object): 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 @@ class CapsCache(object): 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 @@ class CapsCache(object): 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)