Author: dmeyer
Date: Sat Mar 11 18:37:31 2006
New Revision: 8073
Modified:
trunk/WIP/RobShortt/tvserver-epg2/src/config.py
trunk/WIP/RobShortt/tvserver-epg2/src/favorite.py
trunk/WIP/RobShortt/tvserver-epg2/src/interactive.py
trunk/WIP/RobShortt/tvserver-epg2/src/recording.py
trunk/WIP/RobShortt/tvserver-epg2/src/server.py
trunk/WIP/RobShortt/webserver-epg2/src/base.py
trunk/WIP/RobShortt/webserver-epg2/src/config.py
trunk/WIP/webserver/src/listen/__init__.py
trunk/WIP/webserver/src/view/__init__.py
trunk/WIP/webserver/src/watch/__init__.py
trunk/core/src/conf.py
trunk/core/src/ipc/epg.py
trunk/tvdev/src/analog.py
trunk/tvdev/src/base.py
trunk/tvdev/src/control.py
trunk/tvdev/src/dvb.py
trunk/tvdev/src/ivtv.py
trunk/tvdev/src/system.py
trunk/tvdev/src/url.py
trunk/tvserver/src/config.py
trunk/tvserver/src/favorite.py
trunk/tvserver/src/interactive.py
trunk/tvserver/src/recording.py
trunk/tvserver/src/server.py
trunk/ui/src/directory.py
trunk/ui/src/gui/areas/handler.py
trunk/ui/src/menu/item.py
trunk/ui/src/menu/menu.py
trunk/ui/src/menu/stack.py
trunk/ui/src/plugins/mediamenu.py
trunk/webserver/src/base.py
trunk/webserver/src/config.py
Log:
restructure kaa.base
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/config.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/config.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/config.py Sat Mar 11 18:37:31 2006
@@ -4,7 +4,7 @@
import sys
import logging
-from kaa.base.config import Var, Group, Dict, List, Config
+from kaa.config import Var, Group, Dict, List, Config
import freevo.conf
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/favorite.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/favorite.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/favorite.py Sat Mar 11 18:37:31 2006
@@ -37,8 +37,8 @@
import logging
# kaa imports
-from kaa.base import libxml2
-from kaa.base.strutils import unicode_to_str
+from kaa import libxml2
+from kaa.strutils import unicode_to_str
# record imports
from config import config
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/interactive.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/interactive.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/interactive.py Sat Mar 11
18:37:31 2006
@@ -2,7 +2,7 @@
import logging
import kaa.notifier
-from kaa.base.strutils import format
+from kaa.strutils import format
import freevo.ipc
from freevo.ipc import tvserver
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/recording.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/recording.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/recording.py Sat Mar 11 18:37:31 2006
@@ -40,8 +40,8 @@
import os
# kaa imports
-from kaa.base import libxml2
-from kaa.base.strutils import unicode_to_str, str_to_unicode
+from kaa import libxml2
+from kaa.strutils import unicode_to_str, str_to_unicode
# record imports
from config import config
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/server.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/server.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/server.py Sat Mar 11 18:37:31 2006
@@ -40,7 +40,7 @@
import kaa.thumb
from kaa.notifier import Timer, OneShotTimer, Callback, execute_in_timer
-from kaa.base import libxml2
+from kaa import libxml2
# freevo imports
import freevo.ipc
Modified: trunk/WIP/RobShortt/webserver-epg2/src/base.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/base.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/base.py Sat Mar 11 18:37:31 2006
@@ -31,7 +31,7 @@
# -----------------------------------------------------------------------------
# kaa imports
-from kaa.base.strutils import get_encoding
+from kaa.strutils import get_encoding
# webserver imports
import freevo.conf
Modified: trunk/WIP/RobShortt/webserver-epg2/src/config.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/config.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/config.py Sat Mar 11 18:37:31 2006
@@ -4,7 +4,7 @@
import sys
import logging
-from kaa.base.config import Var, Group, Dict, List, Config
+from kaa.config import Var, Group, Dict, List, Config
import freevo.conf
Modified: trunk/WIP/webserver/src/listen/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/listen/__init__.py (original)
+++ trunk/WIP/webserver/src/listen/__init__.py Sat Mar 11 18:37:31 2006
@@ -7,7 +7,7 @@
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
-from kaa.base.strutils import str_to_unicode, unicode_to_str
+from kaa.strutils import str_to_unicode, unicode_to_str
import kaa.cherrypy
import freevo.conf
Modified: trunk/WIP/webserver/src/view/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/view/__init__.py (original)
+++ trunk/WIP/webserver/src/view/__init__.py Sat Mar 11 18:37:31 2006
@@ -7,7 +7,7 @@
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
-from kaa.base.strutils import str_to_unicode, unicode_to_str
+from kaa.strutils import str_to_unicode, unicode_to_str
import kaa.cherrypy
import freevo.conf
Modified: trunk/WIP/webserver/src/watch/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/watch/__init__.py (original)
+++ trunk/WIP/webserver/src/watch/__init__.py Sat Mar 11 18:37:31 2006
@@ -7,7 +7,7 @@
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
-from kaa.base.strutils import str_to_unicode, unicode_to_str
+from kaa.strutils import str_to_unicode, unicode_to_str
import kaa.cherrypy
import freevo.conf
Modified: trunk/core/src/conf.py
==============================================================================
--- trunk/core/src/conf.py (original)
+++ trunk/core/src/conf.py Sat Mar 11 18:37:31 2006
@@ -69,11 +69,11 @@
import gc
# kaa imports
-from kaa.base.strutils import to_unicode as Unicode
-from kaa.base.strutils import to_str as String
-from kaa.base.strutils import ENCODING
-from kaa.base.config import Var, Group, Dict, List
-from kaa.base.config import Config as KaaConfig
+from kaa.strutils import to_unicode as Unicode
+from kaa.strutils import to_str as String
+from kaa.strutils import ENCODING
+from kaa.config import Var, Group, Dict, List
+from kaa.config import Config as KaaConfig
from kaa.notifier import Timer
class Config(KaaConfig):
Modified: trunk/core/src/ipc/epg.py
==============================================================================
--- trunk/core/src/ipc/epg.py (original)
+++ trunk/core/src/ipc/epg.py Sat Mar 11 18:37:31 2006
@@ -39,7 +39,7 @@
import logging
import os
-from kaa.base.config import Var, Group, Dict, List, Config
+from kaa.config import Var, Group, Dict, List, Config
import kaa.epg2
# FIXME: create logger objects in conf
Modified: trunk/tvdev/src/analog.py
==============================================================================
--- trunk/tvdev/src/analog.py (original)
+++ trunk/tvdev/src/analog.py Sat Mar 11 18:37:31 2006
@@ -37,7 +37,7 @@
# kaa imports
import kaa.record
from kaa.record.v4l_tuner import V4L
-from kaa.base.config import Config, Group, Var
+from kaa.config import Config, Group, Var
from kaa.record.v4l_frequencies import CHANLIST
# tvdev imports
Modified: trunk/tvdev/src/base.py
==============================================================================
--- trunk/tvdev/src/base.py (original)
+++ trunk/tvdev/src/base.py Sat Mar 11 18:37:31 2006
@@ -37,7 +37,7 @@
import logging
# kaa imports
-from kaa.base.config import Config, Group, Var
+from kaa.config import Config, Group, Var
# get logging object
log = logging.getLogger('config')
Modified: trunk/tvdev/src/control.py
==============================================================================
--- trunk/tvdev/src/control.py (original)
+++ trunk/tvdev/src/control.py Sat Mar 11 18:37:31 2006
@@ -75,7 +75,7 @@
# kaa imports
import kaa
import kaa.record
-import kaa.base.strutils
+import kaa.strutils
# mbus support
import freevo.ipc
@@ -134,7 +134,7 @@
else:
raise IndexError('%s invalid' % id)
- filename = kaa.base.strutils.unicode_to_str(filename)
+ filename = kaa.strutils.unicode_to_str(filename)
if filename.startswith('file:/'):
filename = filename[5:]
Modified: trunk/tvdev/src/dvb.py
==============================================================================
--- trunk/tvdev/src/dvb.py (original)
+++ trunk/tvdev/src/dvb.py Sat Mar 11 18:37:31 2006
@@ -37,8 +37,8 @@
# kaa imports
import kaa.record
-from kaa.base.ioctl import ioctl, pack, unpack, IOR
-from kaa.base.config import Config, Group, Var
+from kaa.ioctl import ioctl, pack, unpack, IOR
+from kaa.config import Config, Group, Var
# tvdev imports
import base
Modified: trunk/tvdev/src/ivtv.py
==============================================================================
--- trunk/tvdev/src/ivtv.py (original)
+++ trunk/tvdev/src/ivtv.py Sat Mar 11 18:37:31 2006
@@ -36,7 +36,7 @@
# kaa imports
import kaa.record
-from kaa.base.config import Config, Group, Var
+from kaa.config import Config, Group, Var
# tvdev imports
import base
Modified: trunk/tvdev/src/system.py
==============================================================================
--- trunk/tvdev/src/system.py (original)
+++ trunk/tvdev/src/system.py Sat Mar 11 18:37:31 2006
@@ -37,8 +37,8 @@
import logging
# kaa imports
-from kaa.base.config import Config
-from kaa.base.ioctl import ioctl, pack, unpack, IOR
+from kaa.config import Config
+from kaa.ioctl import ioctl, pack, unpack, IOR
# tvdev imports
import dvb
Modified: trunk/tvdev/src/url.py
==============================================================================
--- trunk/tvdev/src/url.py (original)
+++ trunk/tvdev/src/url.py Sat Mar 11 18:37:31 2006
@@ -38,7 +38,7 @@
# kaa imports
import kaa.record
-from kaa.base.config import Config, Group, Var
+from kaa.config import Config, Group, Var
# tvdev imports
import base
Modified: trunk/tvserver/src/config.py
==============================================================================
--- trunk/tvserver/src/config.py (original)
+++ trunk/tvserver/src/config.py Sat Mar 11 18:37:31 2006
@@ -4,7 +4,7 @@
import sys
import logging
-from kaa.base.config import Var, Group, Dict, List, Config
+from kaa.config import Var, Group, Dict, List, Config
import freevo.conf
Modified: trunk/tvserver/src/favorite.py
==============================================================================
--- trunk/tvserver/src/favorite.py (original)
+++ trunk/tvserver/src/favorite.py Sat Mar 11 18:37:31 2006
@@ -37,8 +37,8 @@
import logging
# kaa imports
-from kaa.base import libxml2
-from kaa.base.strutils import unicode_to_str
+from kaa import libxml2
+from kaa.strutils import unicode_to_str
# record imports
from config import config
Modified: trunk/tvserver/src/interactive.py
==============================================================================
--- trunk/tvserver/src/interactive.py (original)
+++ trunk/tvserver/src/interactive.py Sat Mar 11 18:37:31 2006
@@ -2,7 +2,7 @@
import logging
import kaa.notifier
-from kaa.base.strutils import format
+from kaa.strutils import format
import freevo.ipc
from freevo.ipc import tvserver
Modified: trunk/tvserver/src/recording.py
==============================================================================
--- trunk/tvserver/src/recording.py (original)
+++ trunk/tvserver/src/recording.py Sat Mar 11 18:37:31 2006
@@ -40,8 +40,8 @@
import os
# kaa imports
-from kaa.base import libxml2
-from kaa.base.strutils import unicode_to_str, str_to_unicode
+from kaa import libxml2
+from kaa.strutils import unicode_to_str, str_to_unicode
# record imports
from config import config
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Sat Mar 11 18:37:31 2006
@@ -40,7 +40,7 @@
import kaa.thumb
from kaa.notifier import Timer, OneShotTimer, Callback, execute_in_timer
-from kaa.base import libxml2
+from kaa import libxml2
# freevo imports
import freevo.ipc
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Sat Mar 11 18:37:31 2006
@@ -37,7 +37,7 @@
import time
# kaa imports
-import kaa.base
+import kaa
import kaa.notifier
# freevo imports
@@ -784,7 +784,7 @@
item_menu.autoselect = self.DIRECTORY_AUTOPLAY_SINGLE_ITEM
self.pushmenu(item_menu)
- self.item_menu = kaa.base.weakref(item_menu)
+ self.item_menu = kaa.weakref(item_menu)
callback = kaa.notifier.Callback(self.browse, True)
mediadb.watcher.cwd(listing, callback)
Modified: trunk/ui/src/gui/areas/handler.py
==============================================================================
--- trunk/ui/src/gui/areas/handler.py (original)
+++ trunk/ui/src/gui/areas/handler.py Sat Mar 11 18:37:31 2006
@@ -52,7 +52,7 @@
# freevo imports
import config
import util.cache
-from kaa.base.weakref import weakref
+from kaa.weakref import weakref
# gui imports
import gui
Modified: trunk/ui/src/menu/item.py
==============================================================================
--- trunk/ui/src/menu/item.py (original)
+++ trunk/ui/src/menu/item.py Sat Mar 11 18:37:31 2006
@@ -40,7 +40,7 @@
import copy
# kaa imports
-from kaa.base import weakref
+from kaa import weakref
# freevo imports
import plugin
Modified: trunk/ui/src/menu/menu.py
==============================================================================
--- trunk/ui/src/menu/menu.py (original)
+++ trunk/ui/src/menu/menu.py Sat Mar 11 18:37:31 2006
@@ -36,7 +36,7 @@
import logging
# kaa imports
-from kaa.base import weakref
+from kaa import weakref
# menu imports
from item import Item
Modified: trunk/ui/src/menu/stack.py
==============================================================================
--- trunk/ui/src/menu/stack.py (original)
+++ trunk/ui/src/menu/stack.py Sat Mar 11 18:37:31 2006
@@ -39,7 +39,7 @@
import logging
# kaa imports
-from kaa.base import weakref
+from kaa import weakref
# freevo imports
import config
Modified: trunk/ui/src/plugins/mediamenu.py
==============================================================================
--- trunk/ui/src/plugins/mediamenu.py (original)
+++ trunk/ui/src/plugins/mediamenu.py Sat Mar 11 18:37:31 2006
@@ -36,7 +36,7 @@
import logging
# kaa imports
-from kaa.base import weakref
+from kaa import weakref
# freevo imports
import config
Modified: trunk/webserver/src/base.py
==============================================================================
--- trunk/webserver/src/base.py (original)
+++ trunk/webserver/src/base.py Sat Mar 11 18:37:31 2006
@@ -31,7 +31,7 @@
# -----------------------------------------------------------------------------
# kaa imports
-from kaa.base.strutils import get_encoding
+from kaa.strutils import get_encoding
# webserver imports
import freevo.conf
Modified: trunk/webserver/src/config.py
==============================================================================
--- trunk/webserver/src/config.py (original)
+++ trunk/webserver/src/config.py Sat Mar 11 18:37:31 2006
@@ -4,7 +4,7 @@
import sys
import logging
-from kaa.base.config import Var, Group, Dict, List, Config
+from kaa.config import Var, Group, Dict, List, Config
import freevo.conf
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
