Changeset 89

Timestamp:

04/08/02 09:27:14 (7 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBJabber/RBJabber/JID.py (modified) (1 diff)
• trunk/RBJabber/RBJabber/JabberConnection.py (modified) (2 diffs)
• trunk/RBJabber/RBJabber/Test.py (modified) (2 diffs)

trunk/RBJabber/RBJabber/JID.py

@@ -83 +83 @@
-    return join(splitnorm(strJID, 1, 3))
-
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~ Class JID 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class JID(str):
+    """An object-oriented way of dealing with JIDs"""
+    split = split
+    splitnorm = splitnorm
+    normalize = normalize
+    nominal = nominal
+    compare = compare
+
+    def join(Class, *args):
+        return Class(apply(join, args))
+    join = classmethod(join)
+
+    __cmp__ = cmp_
+    def __eq__(self, other): 
+        return cmp_(self, other) == 0
+    def __ne__(self, other): 
+        return cmp_(self, other) != 0
+    def __lt__(self, other): 
+        return cmp_(self, other) < 0
+    def __le__(self, other): 
+        return cmp_(self, other) <= 0
+    def __gt__(self, other): 
+        return cmp_(self, other) > 0
+    def __ge__(self, other): 
+        return cmp_(self, other) >= 0
+
+    def __hash__(self):
+        return hash(self.normalize())
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~ Testing 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+def _Test_JID():
+    j1 = JID('user.name@jabber.org/Resource')
+    j2 = JID('User.Name@Jabber.org/Resource')
+    j3 = JID('User.Name@Jabber.org/ReSoUrCe')
+
+    assert(j1 == j2)
+    assert(j1 >= j2)
+    assert(j1 <= j2)
+    assert(j1 != j3)
+    assert(j2 != j3)
+    assert(j3 < j1)
+    assert(j1 > j3)
+    assert(j3 < j2)
+    assert(j2 > j3)
+    assert(j1.splitnorm() == j2.splitnorm() != j3.splitnorm())
+    assert(j1.splitnorm(1,3) == j2.splitnorm(1,3) == j3.splitnorm(1,3))
+    assert(hash(j1) == hash(j2))
+    assert(hash(j1) != hash(j3))
+    assert(hash(j2) != hash(j3))
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+if __name__=='__main__':
+    print "Testing..."
+    _Test_JID() 
+    print "Test complete."
+
+

trunk/RBJabber/RBJabber/JabberConnection.py

@@ -113 +113 @@
-        self._fileOut = fileOut
-
+    def Process(self, timeout=None):
+        lstSelected = select.select(self._NeedsRead() and [self] or [], self._NeedsWrite() and [self] or [], self._NeedsError() and [self] or [], timeout)
+
+        if lstSelected[0]: self._ProcessRead()
+        if lstSelected[1]: self._ProcessWrite()
+        if lstSelected[2]: self._ProcessError()
+
+        return (lstSelected[0] or lstSelected[1] or lstSelected[2]) and 1 or 0
+
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Private Methods 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def _start_element(self, name, attributes):
+        if name[:7] == 'jabber:':
+            for key in ('to', 'from', 'jid'):
+                if key in attributes: 
+                    attributes[key] = JID.JID(attributes[key])
+        return super(Client, self)._start_element(name, attributes)
-
-    def _GetElementFactory(self, owner, parent, namespace, node, attributes):
@@ -140 +156 @@
-            self._sendData = self._sendData[nSent:]
-
-    def Process(self, timeout=None):
-        lstSelected = select.select(self._NeedsRead() and [self] or [], self._NeedsWrite() and [self] or [], self._NeedsError() and [self] or [], timeout)
-
-        if lstSelected[0]: self._ProcessRead()
-        if lstSelected[1]: self._ProcessWrite()
-        if lstSelected[2]: self._ProcessError()
-
-        return (lstSelected[0] or lstSelected[1] or lstSelected[2]) and 1 or 0
-

trunk/RBJabber/RBJabber/Test.py

@@ -68 +68 @@
-def _printPresence(subject, **UpdateDict):
-    print
-
-
+
+
+
-    print
-
@@ -137 +138 @@
-        apply(jc.Authenticate, tuple(), dictLogin)
-        
-
-
-
-
-
+
+
-
-        pm = PresenceMap(jc)