summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/contact.py2
-rw-r--r--src/roster.py6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/contact.py b/src/contact.py
index 11b83241..69dfb984 100644
--- a/src/contact.py
+++ b/src/contact.py
@@ -77,7 +77,6 @@ class Contact(object):
@property
def pending_in(self):
- log.debug('IN %s %s' % (self.bare_jid, self.__item['pending_in']))
return self.__item['pending_in']
@pending_in.setter
@@ -86,7 +85,6 @@ class Contact(object):
@property
def pending_out(self):
- log.debug('OUT %s %s' % (self.bare_jid, self.__item['pending_out']))
return self.__item['pending_out']
@pending_out.setter
diff --git a/src/roster.py b/src/roster.py
index 269c318f..957ed51a 100644
--- a/src/roster.py
+++ b/src/roster.py
@@ -55,7 +55,6 @@ class Roster(object):
key = JID(key).bare
if key in self.contacts and self.contacts[key] is not None:
return self.contacts[key]
- log.debug('JIDS: %s' % self.jids())
if key in self.jids():
contact = Contact(self.__node[key])
self.contacts[key] = contact
@@ -68,9 +67,9 @@ class Roster(object):
def __delitem__(self, jid):
"""Remove a contact from the roster"""
jid = JID(jid).bare
- if jid not in self.contacts:
- return log.debug('not in self.contacts')
contact = self[jid]
+ if not contact:
+ return
for group in list(self.groups.values()):
group.remove(contact)
if not group:
@@ -104,7 +103,6 @@ class Roster(object):
def jids(self):
"""List of the contact JIDS"""
- log.debug('%s' % self.__node.keys())
return [key for key in self.__node.keys() if key not in self.__mucs and key != self.jid]
def get_contacts(self):