Author: dmeyer
Date: Sat Mar 11 18:37:17 2006
New Revision: 1267
Added:
trunk/base/src/config.py
- copied unchanged from r1266, /trunk/base/src/base/config.py
trunk/base/src/db.py
- copied unchanged from r1266, /trunk/base/src/base/db.py
trunk/base/src/decorators.py
- copied unchanged from r1266, /trunk/base/src/base/decorators.py
trunk/base/src/distribution.py
- copied, changed from r1266, /trunk/base/src/base/distribution.py
trunk/base/src/ioctl.py
- copied unchanged from r1266, /trunk/base/src/base/ioctl.py
trunk/base/src/ipc.py
- copied unchanged from r1266, /trunk/base/src/base/ipc.py
trunk/base/src/libxml2.py
- copied unchanged from r1266, /trunk/base/src/base/libxml2.py
trunk/base/src/logger.py
- copied unchanged from r1266, /trunk/base/src/base/logger.py
trunk/base/src/strutils.py
- copied unchanged from r1266, /trunk/base/src/base/strutils.py
trunk/base/src/utils.py
- copied unchanged from r1266, /trunk/base/src/base/utils.py
trunk/base/src/version.py
- copied unchanged from r1266, /trunk/base/src/base/version.py
trunk/base/src/weakref.py
- copied unchanged from r1266, /trunk/base/src/base/weakref.py
Removed:
trunk/base/src/base/
Modified:
trunk/WIP/epg2/setup.py
trunk/WIP/epg2/src/__init__.py
trunk/WIP/epg2/src/channel.py
trunk/WIP/epg2/src/client.py
trunk/WIP/epg2/src/program.py
trunk/WIP/epg2/src/server.py
trunk/WIP/epg2/src/source_xmltv.py
trunk/WIP/epg2/src/source_zap2it.py
trunk/WIP/thumb2/setup.py
trunk/WIP/thumb2/src/server.py
trunk/WIP/thumb2/src/thumbnail.py
trunk/WIP/vfs/setup.py
trunk/WIP/vfs/src/__init__.py
trunk/WIP/vfs/src/client.py
trunk/WIP/vfs/src/db.py
trunk/WIP/vfs/src/item.py
trunk/WIP/vfs/src/monitor.py
trunk/WIP/vfs/src/parser.py
trunk/WIP/vfs/src/server.py
trunk/WIP/webinfo/setup.py
trunk/base/src/__init__.py
trunk/base/src/notifier/__init__.py
trunk/base/src/notifier/decorators.py
trunk/base/test/config.py
trunk/base/test/libxml2.py
trunk/canvas/setup.py
trunk/canvas/src/canvas.py
trunk/canvas/src/object.py
trunk/cherrypy/setup.py
trunk/cherrypy/src/config.py
trunk/cherrypy/src/version.py
trunk/display/setup.py
trunk/epg/setup.py
trunk/evas/setup.py
trunk/imlib2/setup.py
trunk/imlib2/src/font.py
trunk/imlib2/src/image.py
trunk/metadata/setup.py
trunk/metadata/src/image/core.py
trunk/metadata/src/mediainfo.py
trunk/metadata/src/misc/dirinfo.py
trunk/mevas/setup.py
trunk/player/setup.py
trunk/player/src/xine.py
trunk/record/setup.py
trunk/record/src/ivtv_tuner.py
trunk/record/src/v4l_tuner.py
trunk/thumb/setup.py
trunk/thumb/src/server.py
trunk/xine/setup.py
trunk/xine/src/__init__.py
Log:
restructure kaa.base
Modified: trunk/WIP/epg2/setup.py
==============================================================================
--- trunk/WIP/epg2/setup.py (original)
+++ trunk/WIP/epg2/setup.py Sat Mar 11 18:37:17 2006
@@ -33,7 +33,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/epg2/src/__init__.py
==============================================================================
--- trunk/WIP/epg2/src/__init__.py (original)
+++ trunk/WIP/epg2/src/__init__.py Sat Mar 11 18:37:17 2006
@@ -2,7 +2,7 @@
import logging
from socket import gethostbyname, gethostname
-from kaa.base import ipc
+from kaa import ipc
from client import *
from server import *
Modified: trunk/WIP/epg2/src/channel.py
==============================================================================
--- trunk/WIP/epg2/src/channel.py (original)
+++ trunk/WIP/epg2/src/channel.py Sat Mar 11 18:37:17 2006
@@ -1,4 +1,4 @@
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
import weakref, time
class Channel(object):
Modified: trunk/WIP/epg2/src/client.py
==============================================================================
--- trunk/WIP/epg2/src/client.py (original)
+++ trunk/WIP/epg2/src/client.py Sat Mar 11 18:37:17 2006
@@ -1,5 +1,5 @@
import libxml2, sys, time, os, weakref, cPickle
-from kaa.base import ipc, db
+from kaa import ipc, db
from kaa.notifier import Signal
from server import *
from channel import *
Modified: trunk/WIP/epg2/src/program.py
==============================================================================
--- trunk/WIP/epg2/src/program.py (original)
+++ trunk/WIP/epg2/src/program.py Sat Mar 11 18:37:17 2006
@@ -1,4 +1,4 @@
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
from channel import *
class Program(object):
Modified: trunk/WIP/epg2/src/server.py
==============================================================================
--- trunk/WIP/epg2/src/server.py (original)
+++ trunk/WIP/epg2/src/server.py Sat Mar 11 18:37:17 2006
@@ -1,6 +1,6 @@
import libxml2, sys, time, os, weakref, logging
-from kaa.base.db import *
-from kaa.base import ipc
+from kaa.db import *
+from kaa import ipc
from kaa.notifier import Signal
__all__ = ['DEFAULT_EPG_PORT', 'GuideServer']
Modified: trunk/WIP/epg2/src/source_xmltv.py
==============================================================================
--- trunk/WIP/epg2/src/source_xmltv.py (original)
+++ trunk/WIP/epg2/src/source_xmltv.py Sat Mar 11 18:37:17 2006
@@ -1,6 +1,6 @@
import sys, time, os, calendar
import kaa.notifier
-from kaa.base import libxml2
+from kaa import libxml2
def timestr2secs_utc(timestr):
"""
Modified: trunk/WIP/epg2/src/source_zap2it.py
==============================================================================
--- trunk/WIP/epg2/src/source_zap2it.py (original)
+++ trunk/WIP/epg2/src/source_zap2it.py Sat Mar 11 18:37:17 2006
@@ -1,7 +1,7 @@
import libxml2
import md5, time, httplib, gzip, calendar
from StringIO import StringIO
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
import kaa
ZAP2IT_HOST = "datadirect.webservices.zap2it.com:80"
Modified: trunk/WIP/thumb2/setup.py
==============================================================================
--- trunk/WIP/thumb2/setup.py (original)
+++ trunk/WIP/thumb2/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/thumb2/src/server.py
==============================================================================
--- trunk/WIP/thumb2/src/server.py (original)
+++ trunk/WIP/thumb2/src/server.py Sat Mar 11 18:37:17 2006
@@ -41,7 +41,7 @@
sys.path.insert(0, __site__)
# kaa imports
-from kaa.base import ipc
+from kaa import ipc
import kaa.notifier
import kaa.metadata
import kaa.imlib2
Modified: trunk/WIP/thumb2/src/thumbnail.py
==============================================================================
--- trunk/WIP/thumb2/src/thumbnail.py (original)
+++ trunk/WIP/thumb2/src/thumbnail.py Sat Mar 11 18:37:17 2006
@@ -40,7 +40,7 @@
import logging
# kaa imports
-from kaa.base import ipc, weakref
+from kaa import ipc, weakref
from kaa.notifier import Signal, step
# kaa.thumb imports
Modified: trunk/WIP/vfs/setup.py
==============================================================================
--- trunk/WIP/vfs/setup.py (original)
+++ trunk/WIP/vfs/setup.py Sat Mar 11 18:37:17 2006
@@ -35,7 +35,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/vfs/src/__init__.py
==============================================================================
--- trunk/WIP/vfs/src/__init__.py (original)
+++ trunk/WIP/vfs/src/__init__.py Sat Mar 11 18:37:17 2006
@@ -34,7 +34,7 @@
import os
import logging
-from kaa.base import ipc
+from kaa import ipc
from client import Client
# connected client object
Modified: trunk/WIP/vfs/src/client.py
==============================================================================
--- trunk/WIP/vfs/src/client.py (original)
+++ trunk/WIP/vfs/src/client.py Sat Mar 11 18:37:17 2006
@@ -40,7 +40,7 @@
import logging
# kaa imports
-from kaa.base import ipc, weakref
+from kaa import ipc, weakref
from kaa.notifier import OneShotTimer
# kaa.vfs imports
Modified: trunk/WIP/vfs/src/db.py
==============================================================================
--- trunk/WIP/vfs/src/db.py (original)
+++ trunk/WIP/vfs/src/db.py Sat Mar 11 18:37:17 2006
@@ -40,8 +40,8 @@
# kaa imports
import kaa.notifier
-from kaa.base import db
-from kaa.base.db import *
+from kaa import db
+from kaa.db import *
# get logging object
log = logging.getLogger('vfs')
Modified: trunk/WIP/vfs/src/item.py
==============================================================================
--- trunk/WIP/vfs/src/item.py (original)
+++ trunk/WIP/vfs/src/item.py Sat Mar 11 18:37:17 2006
@@ -38,7 +38,7 @@
# kaa imports
import kaa.thumb2
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
UNKNOWN = -1
Modified: trunk/WIP/vfs/src/monitor.py
==============================================================================
--- trunk/WIP/vfs/src/monitor.py (original)
+++ trunk/WIP/vfs/src/monitor.py Sat Mar 11 18:37:17 2006
@@ -37,7 +37,7 @@
import logging
# kaa imports
-from kaa.base.weakref import weakref
+from kaa.weakref import weakref
from kaa.notifier import WeakTimer, Timer, execute_in_timer, Callback
# kaa.vfs imports
Modified: trunk/WIP/vfs/src/parser.py
==============================================================================
--- trunk/WIP/vfs/src/parser.py (original)
+++ trunk/WIP/vfs/src/parser.py Sat Mar 11 18:37:17 2006
@@ -40,7 +40,7 @@
# kaa imports
from kaa.notifier import Timer, execute_in_timer
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
import kaa.metadata
# get logging object
Modified: trunk/WIP/vfs/src/server.py
==============================================================================
--- trunk/WIP/vfs/src/server.py (original)
+++ trunk/WIP/vfs/src/server.py Sat Mar 11 18:37:17 2006
@@ -45,7 +45,7 @@
sys.path.insert(0, __site__)
# kaa imports
-from kaa.base import ipc, weakref
+from kaa import ipc, weakref
from kaa.notifier import OneShotTimer
# kaa.vfs imports
Modified: trunk/WIP/webinfo/setup.py
==============================================================================
--- trunk/WIP/webinfo/setup.py (original)
+++ trunk/WIP/webinfo/setup.py Sat Mar 11 18:37:17 2006
@@ -38,7 +38,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/base/src/__init__.py
==============================================================================
--- trunk/base/src/__init__.py (original)
+++ trunk/base/src/__init__.py Sat Mar 11 18:37:17 2006
@@ -1,12 +1,18 @@
import os
import stat
-# import base.logger to update the Python logging module
-import base.logger
+# import logger to update the Python logging module
+import logger
# import some basic notifier functions
from kaa.notifier import signals, loop as main, shutdown
+# weakref
+from weakref import weakref
+
+# strutils
+import strutils
+
TEMP = '/tmp/kaa-%s' % os.getuid()
if os.path.isdir(TEMP):
Copied: trunk/base/src/distribution.py (from r1266,
/trunk/base/src/base/distribution.py)
==============================================================================
--- /trunk/base/src/base/distribution.py (original)
+++ trunk/base/src/distribution.py Sat Mar 11 18:37:17 2006
@@ -351,8 +351,8 @@
# be installed.
f = open('src/version.py', 'w')
f.write('# version information for %s\n' % kwargs['name'])
- f.write('# autogenerated by kaa.base.distribution\n\n')
- f.write('from kaa.base.version import Version\n')
+ f.write('# autogenerated by kaa.distribution\n\n')
+ f.write('from kaa.version import Version\n')
f.write('VERSION = Version(\'%s\')\n' % kwargs['version'])
f.close()
Modified: trunk/base/src/notifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/__init__.py (original)
+++ trunk/base/src/notifier/__init__.py Sat Mar 11 18:37:17 2006
@@ -46,7 +46,7 @@
from event import *
from jobserver import *
from jobserver import killall as kill_jobserver
-from kaa.base import utils
+from kaa import utils
from decorators import execute_in_timer, execute_in_thread, execute_in_mainloop
Modified: trunk/base/src/notifier/decorators.py
==============================================================================
--- trunk/base/src/notifier/decorators.py (original)
+++ trunk/base/src/notifier/decorators.py Sat Mar 11 18:37:17 2006
@@ -34,7 +34,7 @@
# notifier thread imports
from thread import MainThreadCallback, is_mainthread
from jobserver import ThreadCallback
-from kaa.base import weakref
+from kaa import weakref
def execute_in_timer(timer, interval, type=''):
"""
Modified: trunk/base/test/config.py
==============================================================================
--- trunk/base/test/config.py (original)
+++ trunk/base/test/config.py Sat Mar 11 18:37:17 2006
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
-from kaa.base.config import Var, Group, Dict, List, Config, VarProxy
+from kaa.config import Var, Group, Dict, List, Config, VarProxy
def config_change_cb(name, oldval, newval):
Modified: trunk/base/test/libxml2.py
==============================================================================
--- trunk/base/test/libxml2.py (original)
+++ trunk/base/test/libxml2.py Sat Mar 11 18:37:17 2006
@@ -1,5 +1,5 @@
import sys
-from kaa.base import libxml2
+from kaa import libxml2
x = libxml2.Document(sys.argv[1], 'freevo')
Modified: trunk/canvas/setup.py
==============================================================================
--- trunk/canvas/setup.py (original)
+++ trunk/canvas/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/canvas/src/canvas.py
==============================================================================
--- trunk/canvas/src/canvas.py (original)
+++ trunk/canvas/src/canvas.py Sat Mar 11 18:37:17 2006
@@ -4,7 +4,7 @@
import _weakref
import kaa
import logging
-from kaa.base import weakref
+from kaa import weakref
from kaa.notifier import Signal, WeakCallback
from container import *
try:
Modified: trunk/canvas/src/object.py
==============================================================================
--- trunk/canvas/src/object.py (original)
+++ trunk/canvas/src/object.py Sat Mar 11 18:37:17 2006
@@ -3,7 +3,7 @@
import types, re
import _weakref
from kaa import evas
-from kaa.base import weakref
+from kaa import weakref
from kaa.notifier import Signal
import animation
Modified: trunk/cherrypy/setup.py
==============================================================================
--- trunk/cherrypy/setup.py (original)
+++ trunk/cherrypy/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import setup
+ from kaa.distribution import setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/cherrypy/src/config.py
==============================================================================
--- trunk/cherrypy/src/config.py (original)
+++ trunk/cherrypy/src/config.py Sat Mar 11 18:37:17 2006
@@ -30,7 +30,7 @@
__all__ = [ 'config' ]
# kaa imports
-from kaa.base.config import Group, Var, Dict
+from kaa.config import Group, Var, Dict
# the config group
config = Group(desc='basic server configuration', schema=[
Modified: trunk/cherrypy/src/version.py
==============================================================================
--- trunk/cherrypy/src/version.py (original)
+++ trunk/cherrypy/src/version.py Sat Mar 11 18:37:17 2006
@@ -1,5 +1,5 @@
# version information for kaa-cherrypy
# autogenerated by kaa.base.distribution
-from kaa.base.version import Version
+from kaa.version import Version
VERSION = Version('0.1')
Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py (original)
+++ trunk/display/setup.py Sat Mar 11 18:37:17 2006
@@ -37,7 +37,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, Configfile, setup, \
+ from kaa.distribution import Extension, Configfile, setup, \
check_library, get_library
except ImportError:
print 'kaa.base not installed'
Modified: trunk/epg/setup.py
==============================================================================
--- trunk/epg/setup.py (original)
+++ trunk/epg/setup.py Sat Mar 11 18:37:17 2006
@@ -34,7 +34,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/evas/setup.py
==============================================================================
--- trunk/evas/setup.py (original)
+++ trunk/evas/setup.py Sat Mar 11 18:37:17 2006
@@ -30,7 +30,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/imlib2/setup.py
==============================================================================
--- trunk/imlib2/setup.py (original)
+++ trunk/imlib2/setup.py Sat Mar 11 18:37:17 2006
@@ -31,7 +31,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/imlib2/src/font.py
==============================================================================
--- trunk/imlib2/src/font.py (original)
+++ trunk/imlib2/src/font.py Sat Mar 11 18:37:17 2006
@@ -30,7 +30,7 @@
# imlib2 wrapper
import _Imlib2
-from kaa.base.strutils import utf8
+from kaa.strutils import utf8
class Font(object):
def __init__(self, fontdesc, color=(255,255,255,255)):
Modified: trunk/imlib2/src/image.py
==============================================================================
--- trunk/imlib2/src/image.py (original)
+++ trunk/imlib2/src/image.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
# imlib2 wrapper
import _Imlib2
-from kaa.base.strutils import utf8
+from kaa.strutils import utf8
from kaa.notifier import Signal
from font import Font
Modified: trunk/metadata/setup.py
==============================================================================
--- trunk/metadata/setup.py (original)
+++ trunk/metadata/setup.py Sat Mar 11 18:37:17 2006
@@ -34,7 +34,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/metadata/src/image/core.py
==============================================================================
--- trunk/metadata/src/image/core.py (original)
+++ trunk/metadata/src/image/core.py Sat Mar 11 18:37:17 2006
@@ -37,7 +37,7 @@
# kaa imports
from kaa.metadata import factory
from kaa.metadata import mediainfo
-from kaa.base import libxml2
+from kaa import libxml2
# get logging object
log = logging.getLogger('metadata')
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Sat Mar 11 18:37:17 2006
@@ -35,7 +35,7 @@
import copy
# kaa imports
-from kaa.base.strutils import str_to_unicode
+from kaa.strutils import str_to_unicode
# kaa metadata imports
import table
Modified: trunk/metadata/src/misc/dirinfo.py
==============================================================================
--- trunk/metadata/src/misc/dirinfo.py (original)
+++ trunk/metadata/src/misc/dirinfo.py Sat Mar 11 18:37:17 2006
@@ -36,8 +36,8 @@
import logging
# kaa imports
-from kaa.base.strutils import unicode_to_str
-from kaa.base import libxml2
+from kaa.strutils import unicode_to_str
+from kaa import libxml2
from kaa.metadata.mediainfo import MediaInfo, MEDIACORE, \
EXTENSION_DIRECTORY, TYPE_MISC
from kaa.metadata.factory import register
Modified: trunk/mevas/setup.py
==============================================================================
--- trunk/mevas/setup.py (original)
+++ trunk/mevas/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import setup
+ from kaa.distribution import setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/player/setup.py
==============================================================================
--- trunk/player/setup.py (original)
+++ trunk/player/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import setup, Extension
+ from kaa.distribution import setup, Extension
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/player/src/xine.py
==============================================================================
--- trunk/player/src/xine.py (original)
+++ trunk/player/src/xine.py Sat Mar 11 18:37:17 2006
@@ -1,7 +1,7 @@
import sys, os, md5, shm, time, fcntl, struct
import kaa
from kaa import notifier, display
-from kaa.base.config import Group, Var
+from kaa.config import Group, Var
try:
from kaa import xine
Modified: trunk/record/setup.py
==============================================================================
--- trunk/record/setup.py (original)
+++ trunk/record/setup.py Sat Mar 11 18:37:17 2006
@@ -34,7 +34,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/record/src/ivtv_tuner.py
==============================================================================
--- trunk/record/src/ivtv_tuner.py (original)
+++ trunk/record/src/ivtv_tuner.py Sat Mar 11 18:37:17 2006
@@ -49,7 +49,7 @@
import time
# kaa imports
-from kaa.base.ioctl import ioctl, IOR, IOW, IOWR
+from kaa.ioctl import ioctl, IOR, IOW, IOWR
from v4l_tuner import *
log = logging.getLogger('record')
Modified: trunk/record/src/v4l_tuner.py
==============================================================================
--- trunk/record/src/v4l_tuner.py (original)
+++ trunk/record/src/v4l_tuner.py Sat Mar 11 18:37:17 2006
@@ -50,7 +50,7 @@
from types import *
# kaa imports
-from kaa.base.ioctl import ioctl, IOR, IOW, IOWR
+from kaa.ioctl import ioctl, IOR, IOW, IOWR
from v4l_frequencies import get_frequency, CHANLIST
log = logging.getLogger('record')
Modified: trunk/thumb/setup.py
==============================================================================
--- trunk/thumb/setup.py (original)
+++ trunk/thumb/setup.py Sat Mar 11 18:37:17 2006
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, setup
+ from kaa.distribution import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/thumb/src/server.py
==============================================================================
--- trunk/thumb/src/server.py (original)
+++ trunk/thumb/src/server.py Sat Mar 11 18:37:17 2006
@@ -2,7 +2,7 @@
import os
import glob
-from kaa.base import ipc
+from kaa import ipc
import kaa.notifier
import kaa.metadata
import kaa.imlib2
Modified: trunk/xine/setup.py
==============================================================================
--- trunk/xine/setup.py (original)
+++ trunk/xine/setup.py Sat Mar 11 18:37:17 2006
@@ -30,7 +30,7 @@
try:
# kaa base imports
- from kaa.base.distribution import Extension, Configfile, setup
+ from kaa.distribution import Extension, Configfile, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/xine/src/__init__.py
==============================================================================
--- trunk/xine/src/__init__.py (original)
+++ trunk/xine/src/__init__.py Sat Mar 11 18:37:17 2006
@@ -3,7 +3,7 @@
import _xine
import kaa
from kaa import display, notifier, metadata
-from kaa.base.version import Version
+from kaa.version import Version
from constants import *
# FIXME: find a good place to document this:
-------------------------------------------------------
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
