this URI stuff is a mess

src/sipcentric/__init__.py

@@ -176,6 +176,9 @@ class APIObject(object):
 
     @classmethod
     def makeUrl(cls, id=None, parent=None):
+        if self._data:
+            if 'uri' in self._data:
+                return self._data['uri']
         if id:
             path = "/%s/%d/" % (cls.URLPART, id)
         else:
@@ -185,6 +188,9 @@ class APIObject(object):
         return path
 
     def url(self, parent=None):
+        if self._data:
+            if 'uri' in self._data:
+                return self._data['uri']
         return self.__class__.makeUrl(self.id, parent)