Remove unused import and apply naming convention.

This commit is contained in:
Stephan Erb 2009-10-24 20:49:16 +02:00
parent fc01d32abd
commit 39c3afb518

View file

@ -23,7 +23,6 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
## ##
from itertools import *
import gajim import gajim
import helpers import helpers
@ -89,31 +88,31 @@ class CapsCache(object):
__names = {} __names = {}
def __init__(ciself, hash_method, hash_): def __init__(ciself, hash_method, hash_):
# cached into db # cached into db
ciself.hash_method = hash_method self.hash_method = hash_method
ciself.hash = hash_ self.hash = hash_
ciself._features = [] self._features = []
ciself._identities = [] self._identities = []
# not cached into db: # not cached into db:
# have we sent the query? # have we sent the query?
# 0 == not queried # 0 == not queried
# 1 == queried # 1 == queried
# 2 == got the answer # 2 == got the answer
ciself.queried = 0 self.queried = 0
def _get_features(ciself): def _get_features(self):
return ciself._features return self._features
def _set_features(ciself, value): def _set_features(self, value):
ciself._features = [] self._features = []
for feature in value: for feature in value:
ciself._features.append(ciself.__names.setdefault(feature, self._features.append(self.__names.setdefault(feature,
feature)) feature))
features = property(_get_features, _set_features) features = property(_get_features, _set_features)
def _get_identities(ciself): def _get_identities(self):
list_ = [] list_ = []
for i in ciself._identities: for i in self._identities:
# transforms it back in a dict # transforms it back in a dict
d = dict() d = dict()
d['category'] = i[0] d['category'] = i[0]
@ -125,20 +124,20 @@ class CapsCache(object):
d['name'] = i[3] d['name'] = i[3]
list_.append(d) list_.append(d)
return list_ return list_
def _set_identities(ciself, value): def _set_identities(self, value):
ciself._identities = [] self._identities = []
for identity in value: for identity in value:
# dict are not hashable, so transform it into a tuple # dict are not hashable, so transform it into a tuple
t = (identity['category'], identity.get('type'), t = (identity['category'], identity.get('type'),
identity.get('xml:lang'), identity.get('name')) identity.get('xml:lang'), identity.get('name'))
ciself._identities.append(ciself.__names.setdefault(t, t)) self._identities.append(self.__names.setdefault(t, t))
identities = property(_get_identities, _set_identities) identities = property(_get_identities, _set_identities)
def update(ciself, identities, features): def update(self, identities, features):
# NOTE: self refers to CapsCache object, not to CacheItem # NOTE: self refers to CapsCache object, not to CacheItem
ciself.identities=identities self.identities=identities
ciself.features=features self.features=features
self.logger.add_caps_entry(ciself.hash_method, ciself.hash, self.logger.add_caps_entry(self.hash_method, self.hash,
identities, features) identities, features)
self.__CacheItem = CacheItem self.__CacheItem = CacheItem