Author: dmeyer
Date: Sat Mar 11 18:53:31 2006
New Revision: 8074
Modified:
trunk/WIP/RobShortt/tvserver-epg2/src/favorite.py
trunk/WIP/RobShortt/tvserver-epg2/src/recording.py
trunk/WIP/RobShortt/tvserver-epg2/src/server.py
trunk/tvserver/src/favorite.py
trunk/tvserver/src/recording.py
trunk/tvserver/src/server.py
Log:
kaa.libxml2 is nor kaa.xml
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:53:31 2006
@@ -37,7 +37,7 @@
import logging
# kaa imports
-from kaa import libxml2
+from kaa import xml
from kaa.strutils import unicode_to_str
# record imports
@@ -228,7 +228,7 @@
"""
Dump informations about the favorite in a fxd file node.
"""
- node = libxml2.Node('favorite', id=self.id)
+ node = xml.Node('favorite', id=self.id)
for var in ('name', 'priority', 'url', 'fxdname'):
if getattr(self, var):
node.add_child(var, getattr(self, var))
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:53:31 2006
@@ -40,7 +40,7 @@
import os
# kaa imports
-from kaa import libxml2
+from kaa import xml
from kaa.strutils import unicode_to_str, str_to_unicode
# record imports
@@ -200,7 +200,7 @@
"""
Dump informations about the recording in a fxd file node.
"""
- node = libxml2.Node('recording', id=self.id)
+ node = xml.Node('recording', id=self.id)
for var in ('name', 'channel', 'priority', 'status',
'subtitle', 'fxdname', 'episode', 'description'):
if getattr(self, var):
@@ -271,7 +271,7 @@
return
# create root node
- fxd = libxml2.Document(root='freevo')
+ fxd = xml.Document(root='freevo')
# create <movie> with title
title = self.name
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:53:31 2006
@@ -40,7 +40,7 @@
import kaa.thumb
from kaa.notifier import Timer, OneShotTimer, Callback, execute_in_timer
-from kaa import libxml2
+from kaa import xml
# freevo imports
import freevo.ipc
@@ -222,7 +222,7 @@
return
try:
- fxd = libxml2.Document(self.fxdfile, 'freevo')
+ fxd = xml.Document(self.fxdfile, 'freevo')
except Exception, e:
log.exception('recordserver.load: %s corrupt:' % self.fxdfile)
sys.exit(1)
@@ -260,7 +260,7 @@
save the fxd file
"""
log.info('save fxd file')
- fxd = libxml2.Document(root='freevo')
+ fxd = xml.Document(root='freevo')
for r in self.recordings:
fxd.add_child(r)
for f in self.favorites:
Modified: trunk/tvserver/src/favorite.py
==============================================================================
--- trunk/tvserver/src/favorite.py (original)
+++ trunk/tvserver/src/favorite.py Sat Mar 11 18:53:31 2006
@@ -37,7 +37,7 @@
import logging
# kaa imports
-from kaa import libxml2
+from kaa import xml
from kaa.strutils import unicode_to_str
# record imports
@@ -228,7 +228,7 @@
"""
Dump informations about the favorite in a fxd file node.
"""
- node = libxml2.Node('favorite', id=self.id)
+ node = xml.Node('favorite', id=self.id)
for var in ('name', 'priority', 'url', 'fxdname'):
if getattr(self, var):
node.add_child(var, getattr(self, var))
Modified: trunk/tvserver/src/recording.py
==============================================================================
--- trunk/tvserver/src/recording.py (original)
+++ trunk/tvserver/src/recording.py Sat Mar 11 18:53:31 2006
@@ -40,7 +40,7 @@
import os
# kaa imports
-from kaa import libxml2
+from kaa import xml
from kaa.strutils import unicode_to_str, str_to_unicode
# record imports
@@ -200,7 +200,7 @@
"""
Dump informations about the recording in a fxd file node.
"""
- node = libxml2.Node('recording', id=self.id)
+ node = xml.Node('recording', id=self.id)
for var in ('name', 'channel', 'priority', 'status',
'subtitle', 'fxdname', 'episode', 'description'):
if getattr(self, var):
@@ -271,7 +271,7 @@
return
# create root node
- fxd = libxml2.Document(root='freevo')
+ fxd = xml.Document(root='freevo')
# create <movie> with title
title = self.name
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Sat Mar 11 18:53:31 2006
@@ -40,7 +40,7 @@
import kaa.thumb
from kaa.notifier import Timer, OneShotTimer, Callback, execute_in_timer
-from kaa import libxml2
+from kaa import xml
# freevo imports
import freevo.ipc
@@ -222,7 +222,7 @@
return
try:
- fxd = libxml2.Document(self.fxdfile, 'freevo')
+ fxd = xml.Document(self.fxdfile, 'freevo')
except Exception, e:
log.exception('recordserver.load: %s corrupt:' % self.fxdfile)
sys.exit(1)
@@ -260,7 +260,7 @@
save the fxd file
"""
log.info('save fxd file')
- fxd = libxml2.Document(root='freevo')
+ fxd = xml.Document(root='freevo')
for r in self.recordings:
fxd.add_child(r)
for f in self.favorites:
-------------------------------------------------------
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
