Changeset 39

Timestamp:

02/25/02 22:52:36 (7 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBFoundation/RBFoundation/XMLObjectify.py (modified) (2 diffs)
• trunk/RBJabber/RBJabber/Client.py (modified) (4 diffs)
• trunk/RBJabber/RBJabber/JabberConnection.py (modified) (4 diffs)
• trunk/RBJabber/RBJabber/Test.py (modified) (5 diffs)
• trunk/RBJabber/RBJabber/iqBrowseResponse.py (added)
• trunk/RBJabber/RBJabber/iqQuery.py (modified) (1 diff)
• trunk/RBJabber/RBJabber/iqResponse.py (modified) (1 diff)
• trunk/RBJabber/RBJabber/iqTimeResponse.py (modified) (1 diff)
• trunk/RBJabber/RBJabber/iqVersionResponse.py (modified) (1 diff)
• trunk/RBSkinning/RBSkinning/xmlPython/evaluate.py (modified) (2 diffs)
• trunk/RBSkinning/RBSkinning/xmlPython/script.py (modified) (2 diffs)

trunk/RBFoundation/RBFoundation/XMLObjectify.py

@@ -74 +74 @@
-        return ''.join(self._toXML(strSplit, nsOuter))
-
-
+, bHeaderOnly=0
-        result = ['<%s ' % self.__node__]
-        if nsOuter != self.__namespace__:
-            result[-1] += 'xmlns=%s ' % quoteattr(self.__namespace__)
-        result[-1] += ' '.join(['%s=%s' % (x[0], quoteattr(str(x[1]))) for x in self._attributes.iteritems()])
-
+
+
+
-            result[-1] += '>'
-            for tupleNSNode, each in self._elements:
@@ -87 +89 @@
-                    result.append(strSplit.join(each._toXML(strSplit, self.__namespace__)))
-            result.append('</%s>' % self.__node__)
-
+
+
-        return result
-    

trunk/RBJabber/RBJabber/Client.py

@@ -6 +6 @@
-import weakref
-from Foundation import XMLObjectify, SubjectObserver
+import iqQuery
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -71 +72 @@
-    stream = None
-    ClientMonitors = None
+    SupportedNS = None
-
-    def __init__(self, *args, **kw):
@@ -77 +79 @@
-        
-        self.ClientMonitors = []
+        self.SupportedNS = []
-        self.__NextID = 0
-
@@ -82 +85 @@
-        self.__NextID += 1
-        return str(self.__NextID)
+
+    def Authenticate(self, username, password, resource, callback=None):
+        strXML = '<username>%s</username><password>%s</password><resource>%s</resource>' % (username, password, resource)
+        self.CurrentUsername = username
+        self.CurrentResource = resource
+        self.CurrentJID = '%s@%s/%s' % (username, self.ServerJID, resource)
+        if callback:
+            query = iqQuery.iqQuery(self, callback)
+        else: query = iqQuery.iqQueryBase(self)
+        query.SendQuery("jabber:iq:auth", '', 'set', strXML)
+        return query
+
+    def Register(self, username, password, callback=None):
+        strXML = '<username>%s</username><password>%s</password>' % (username, password)
+        if callback:
+            query = iqQuery.iqQuery(self, callback)
+        else: query = iqQuery.iqQueryBase(self)
+        query.SendQuery("jabber:iq:register", '', 'set', strXML)
+        return query
+
+    def QueryRoster(self, callback):
+        if callback:
+            query = iqQuery.iqQuery(self, callback)
+        else: query = iqQuery.iqQueryBase(self)
+        query.SendQuery("jabber:iq:roster") 
+        return query
+
+    def BrowseJID(self, toJID, callback):
+        if callback:
+            query = iqQuery.iqQuery(self, callback)
+        else: query = iqQuery.iqQueryBase(self)
+        query.SendQuery("jabber:iq:browse", toJID) 
+        return query
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBJabber/RBJabber/JabberConnection.py

@@ -40 +40 @@
-
-    def __init__(self, JabberServerURL, port=5222):
+        self._SetDebug(None, None)
+
-        # Base code
-        XMLBuilderMixin.__init__(self)
@@ -77 +79 @@
-        self._parser = None
-
+    def _SetDebug(self, fileread, filewrite):
+        self._fileread = fileread
+        self._filewrite = filewrite
+
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #~ Private Methods 
@@ -88 +94 @@
-    def _ProcessRead(self):
-        data = self._socket.recv(8192)
+        if __debug__ and self._fileread: print >> self._fileread, data
-        self._parser.Parse(data)
-         
@@ -93 +100 @@
-    def _ProcessWrite(self):
-        nSent = self._socket.send(self._sendData)
+        if __debug__ and self._filewrite: print >> self._filewrite, self._sendData[:nSent]
-        self._sendData = self._sendData[nSent:]
-

trunk/RBJabber/RBJabber/Test.py

@@ -6 +6 @@
-from iqTimeResponse import iqTimeResponse
-from iqVersionResponse import iqVersionResponse
+from iqBrowseResponse import iqBrowseResponse
-from pprint import pprint
+import sys
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -42 +44 @@
-    print 
-    print "Roster Received!"
-roster.query[0].item
+getattr(roster.query[0], 'item', [])
-        print each._toPrettyXML()
-    print
@@ -49 +51 @@
-    print 
-    print "Version Received!"
+    print value._toPrettyXML()
+    print
+
+def _printIt(subject, name, value):
+    print 
+    print "PRINT IT!!!"
-    print value._toPrettyXML()
-    print
@@ -61 +69 @@
-        dictLogin.setdefault('resource', resource)
-        jc = Client(dictLogin['server'])
+        jc._SetDebug(sys.stdout, sys.stdout)
+        process = SmartSelect()
+        process.append(jc)
-        del dictLogin['server']
-
-strXML = ''.join([('<%s>%s</%s>' % (s[0], s[1], s[0])) for s in dictLogin.iteritems()])
-iqQuery(jc, _printAuth).SendQuery("jabber:iq:auth", jc.ServerJID, 'set', strXML
+dictLogin['callback'] = _printAuth
+apply(jc.Authenticate, tuple(), dictLogin
-        
-        obs = SubjectObserver.AssociativeObserver()
@@ -74 +85 @@
-        pm = PresenceMap(jc)
-
-        process = SmartSelect()
-        process.append(jc)
-        for x in xrange(2): process(1)
-        jc.SendXML('''<presence type='available' />''')
-        for x in xrange(2): process(1)
-
-
+
+
+
-        #iqQuery(jc, _printVersion).SendQuery("jabber:iq:version", 'shane.holloway@www.runeblade.com/Laptop')
-        #iqQuery(jc, _printVersion).SendQuery("jabber:iq:version", 'shane.holloway@myjabber.net')
-        iqTimeResponse(jc)
-        iqVersionResponse(jc, 'RuneBlade Foundation Jabber', '0.01')
+        iqBrowseResponse(jc)
-        while 1: process(1)
-    except KeyboardInterrupt:

trunk/RBJabber/RBJabber/iqQuery.py

@@ -24 +24 @@
-            if bMatch: bMatch = (not self.jidQuery or getattr(iq, 'from_', '') == self.jidQuery)
-            # and the query result namespace is the same
-
+# 
-            # then we have a match
-            return bMatch and 1 or 0

trunk/RBJabber/RBJabber/iqResponse.py

@@ -40 +40 @@
-        # Lets observer the jabber stream
-        self.JC().stream.AddObserver('iq', self)
+        self.JC().SupportedNS.append(nsQuery)
-        # Setup our match attributes
-        self.nsQuery = nsQuery

trunk/RBJabber/RBJabber/iqTimeResponse.py

@@ -26 +26 @@
-        del iq.from_
-        iq.type = 'result'
-iq._client
+self.JC()
-

trunk/RBJabber/RBJabber/iqVersionResponse.py

@@ -32 +32 @@
-        del iq.from_
-        iq.type = 'result'
-iq._client
+self.JC()

trunk/RBSkinning/RBSkinning/xmlPython/evaluate.py

@@ -12 +12 @@
-    default_settings = SkinObject.default_settings.copy()
-    default_settings['phase'] = 'initialize'
+    default_settings['contextvar'] = ''
-    
-    def SkinInitialize(self):
@@ -24 +25 @@
-        code = ''.join(self.Content()) or self.settings['code']
-        self.object = eval(code, {'self':self}, {})
+        if self.settings['contextvar']:
+            setattr(self.context, self.settings['contextvar'], self.object)
-

trunk/RBSkinning/RBSkinning/xmlPython/script.py

@@ -14 +14 @@
-    default_settings['args'] = '(self,)'
-    default_settings['kw'] = '{}'
+    default_settings['contextvar'] = ''
-    
-    def SkinInitialize(self):
@@ -29 +30 @@
-        kw = eval(self.settings['kw'], {'self':self}, {})
-        self.object = apply(call, args, kw)
+        if self.settings['contextvar']:
+            setattr(self.context, self.settings['contextvar'], self.object)
-