[Freevo-cvslog] Kaa r3033 - in trunk: base/src/net base/src/notifier beacon/src/server feedmanager/src feedmanager/src/beacon

[Dirk Meyer]

Author: dmeyer
Date: Tue Feb  5 08:29:46 2008
New Revision: 3033

Log:
move kaa.notifier.url to kaa.net.url

Added:
   trunk/base/src/net/
   trunk/base/src/net/__init__.py
   trunk/base/src/net/url.py
      - copied unchanged from r3025, /trunk/base/src/notifier/url.py
Removed:
   trunk/base/src/notifier/url.py
Modified:
   trunk/beacon/src/server/server.py
   trunk/feedmanager/src/beacon/feeds.py
   trunk/feedmanager/src/core.py

Added: trunk/base/src/net/__init__.py
==============================================================================

Modified: trunk/beacon/src/server/server.py
==============================================================================
--- trunk/beacon/src/server/server.py   (original)
+++ trunk/beacon/src/server/server.py   Tue Feb  5 08:29:46 2008
@@ -38,7 +38,7 @@
 # kaa imports
 from kaa import OneShotTimer, Timer, Callback
 import kaa.rpc
-from kaa.notifier.url import add_password
+from kaa.net.url import add_password
 
 # kaa.beacon server imports
 import parser

Modified: trunk/feedmanager/src/beacon/feeds.py
==============================================================================
--- trunk/feedmanager/src/beacon/feeds.py       (original)
+++ trunk/feedmanager/src/beacon/feeds.py       Tue Feb  5 08:29:46 2008
@@ -36,7 +36,7 @@
 
 # kaa imports
 import kaa
-import kaa.notifier.url
+import kaa.net.url
 import kaa.feedmanager
 import kaa.rpc
 
@@ -106,4 +106,4 @@
     server.ipc.connect(IPC())
     # add password information
     for auth in kaa.feedmanager.config.authentication:
-        kaa.notifier.url.add_password(None, auth.site, auth.username, 
auth.password)
+        kaa.net.url.add_password(None, auth.site, auth.username, auth.password)

Modified: trunk/feedmanager/src/core.py
==============================================================================
--- trunk/feedmanager/src/core.py       (original)
+++ trunk/feedmanager/src/core.py       Tue Feb  5 08:29:46 2008
@@ -40,7 +40,7 @@
 
 # kaa imports
 import kaa
-import kaa.notifier.url
+import kaa.net.url
 import kaa.beacon
 from kaa.strutils import str_to_unicode, unicode_to_str
 
@@ -69,7 +69,7 @@
         log.info('%s -> %s' % (self.url, filename))
         tmpname = os.path.join(os.path.dirname(filename),
                                '.' + os.path.basename(filename))
-        return kaa.notifier.url.fetch(self.url, filename, tmpname)
+        return kaa.net.url.fetch(self.url, filename, tmpname)
 
 
 class Feed(object):
@@ -167,7 +167,7 @@
         fname = os.path.join(self.IMAGEDIR, fname)
         if os.path.isfile(fname):
             yield fname
-        yield kaa.notifier.url.fetch(url, fname)
+        yield kaa.net.url.fetch(url, fname)
         yield fname
 
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
Freevo-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog