Changeset 468

Timestamp:

03/05/03 18:08:53 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBFoundation/RBFoundation/DateUtils.py (added)
• trunk/RBFoundation/RBFoundation/Utilities.py (modified) (1 diff)
• trunk/RBFoundation/RBFoundation/XMLNode.py (modified) (2 diffs)
• trunk/RBTelepathy/RBTelepathy/Packet/URIAddress.py (modified) (1 diff)

trunk/RBFoundation/RBFoundation/Utilities.py

@@ -61 +61 @@
-    return cleanupstrlst(data.split(splitchar), *args, **kw)
-
+#~ iso formated time information ~~~~~~~~~~~~~~~~~~~~
+
+def fromisoformat(strtime, sectionsep='T', datesep='-', timesep=':'):
+    """ISO 8601 format, YYYY-MM-DDTHH:MM:SS
+    returns (YYYY, MM, DD, HH, MM, SS, -1, -1, -1)
+    compatible with time module's mktime method."""
+    datesent, timesent = strtime.split(sectionsep)[:2]
+    datesent = map(int, datesent.split(datesep)[:3])
+    timesent = map(int, timesent.split(timesep)[:3])
+    return tuple(datesent + timesent + (-1,-1,-1))
+
+def fromisoformat_date(strtime, datesep='-'):
+    """ISO 8601 format, YYYY-MM-DDTHH:MM:SS
+    returns (YYYY, MM, DD)"""
+    datesent = map(int, datesent.split(datesep)[:3])
+    return tuple(datesent)
+
+def fromisoformat_time(strtime, timesep=':'):
+    """ISO 8601 format, YYYY-MM-DDTHH:MM:SS
+    returns (HH, MM, SS)"""
+    timesent = map(int, timesent.split(timesep)[:3])
+    return tuple(datesent)
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBFoundation/RBFoundation/XMLNode.py

@@ -237 +237 @@
-            return self.addnode(*elem)
-
+    def insertelem(self, idx, elem):
+        if isinstance(elem, basestring):
+            return self.insertdata(elem)
+        elif isinstance(elem, xmlnodebase):
+            # For elements that are prebuilt
+            self.elems.insert(idx, elem)
+            return elem
+        else: 
+            # For building from tuples and lists
+            return self.insertnode(*elem)
+
-    def setxmlns(self, *args, **kw):
-        return self.namespaces.setxmlns(*args, **kw)
@@ -273 +284 @@
-        for idx in dellist:
-            del self.elems[idx]
+
+    def data(self, joinstr=''):
+        return joinstr.join(map(type(joinstr), self.iterdata(None)))
-
-    def hasdata(self, *args, **kw):

trunk/RBTelepathy/RBTelepathy/Packet/URIAddress.py

@@ -50 +50 @@
-    """
-
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Special 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def __cmp__(self, other):
+        return cmp(self.astuple(), other.astuple())
+
+    def astuple(self):
+        return (self.scheme, self.network, self.acount, self.path, self.query, self.fragment)
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Protected Methods 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
-    def _getAuthority(self):
-        if self.network is not None: