Changeset 139:d3dd88d429fb for wokkel/muc.py

Timestamp:

Aug 4, 2011, 9:12:43 PM (9 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

Remove some left over error related classes.

File:

• wokkel/muc.py (modified) (6 diffs)

wokkel/muc.py

@@ -84 +84 @@
 
 DEFER_TIMEOUT = 30 # basic timeout is 30 seconds
-
-class NotFound(Exception):
-    """
-    """
-    condition = 'cancel'
-    mucCondition = 'not-found'
 
 
@@ -525 +519 @@
                                       label='Requested role'))
         self.addChild(form.toElement())
-
-
-
-class PresenceError(xmppim.Presence):
-    """
-    This behaves like an object providing L{domish.IElement}.
-    """
-
-    def __init__(self, error, to=None, frm=None):
-        xmppim.Presence.__init__(self, to, type='error')
-        if frm:
-            self['from'] = frm
-        # add muc elements
-        x = self.addElement('x', NS_MUC)
-
-        # add error
-        e = error.getElement()
-        self.addChild(e)
 
 
@@ -753 +729 @@
             # change the state of the room
             room = self._getRoom(occupantJID)
-            if room is None:
-                raise NotFound
             room.state = 'joined'
 
@@ -776 +750 @@
         else:
             # change the state of the room
-            room = self._getRoom(occupantJID)
-            if room is None:
-                raise NotFound
             self._removeRoom(occupantJID)
 
@@ -1003 +974 @@
 
         room = self._getRoom(roomJID)
-        if room is None:
-            raise NotFound
 
         # Change the nickname
@@ -1058 +1027 @@
         """
         room = self._getRoom(occupantJID)
-        if room is None:
-            raise NotFound
 
         p = BasicPresence(to=room.occupantJID)