small changes in Add: function to assemble a uri

Author: eppye

bots/botslib.py

@@ -774,11 +774,13 @@ class Uri(object):
     '''
     def __init__(self, **kw):
         self._uri = dict(scheme='',username='',password='',hostname='',port='', path='', filename='',query={},fragment='')
-        self.__call__(**kw)
-    def __call__( self, **kw):
+        self.update(**kw)
+    def update( self, **kw):
         self._uri.update(**kw)
-    def __str__(self, **kw):
-        self.__call__(**kw)
+    def uri(self, **kw):
+        self.update(**kw)
+        return self.__str__()
+    def __str__(self):
         scheme   = self._uri['scheme'] + ':' if self._uri['scheme'] else ''
         password = ':' + self._uri['password'] if self._uri['password'] else ''
         userinfo = self._uri['username'] + password + '@' if self._uri['username'] else ''
@@ -790,7 +792,6 @@ def __str__(self, **kw):
         else:
             terug = authority
         return scheme + terug
-    uri = __str__
 #**********************************************************/**
 #**************  Exception classes ***************************
 #**********************************************************/**

uniturl.py

@@ -42,7 +42,7 @@ def testempty(self):
         #~ self.assertEqual('scheme://username:password@hostname:80/path1/path2/filename',str(Uri(scheme='scheme',username='username',password='password',hostname='hostname',port=80,path='path1/path2',filename= 'filename')),'basis')
 
     def testcalls(self):
-        self.assertEqual('scheme:/path1/path2/filename',Uri(scheme='scheme',path='/path1/path2',filename='filename').uri(),'')
+        self.assertEqual('scheme:/path1/path2/filename2',Uri(scheme='scheme',path='/path1/path2',filename='filename').uri(filename='filename2'),'')
 
 
 if __name__ == '__main__':