Author: dmeyer
Date: Sat Mar 11 18:51:42 2006
New Revision: 1270
Added:
trunk/base/src/xml.py
- copied, changed from r1267, /trunk/base/src/libxml2.py
trunk/base/test/xml.py
- copied, changed from r1267, /trunk/base/test/libxml2.py
Removed:
trunk/base/src/libxml2.py
trunk/base/test/libxml2.py
Modified:
trunk/WIP/epg2/src/source_xmltv.py
trunk/cherrypy/src/version.py
trunk/metadata/src/image/core.py
trunk/metadata/src/misc/dirinfo.py
trunk/metadata/src/misc/xmlinfo.py
Log:
rename libxml2.py to xml.py
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:51:42 2006
@@ -1,6 +1,6 @@
import sys, time, os, calendar
import kaa.notifier
-from kaa import libxml2
+from kaa import xml
def timestr2secs_utc(timestr):
"""
@@ -129,7 +129,7 @@
pass
def _update_parse_xml_thread(epg, xmltv_file):
- doc = libxml2.Document(xmltv_file, 'tv')
+ doc = xml.Document(xmltv_file, 'tv')
channel_id_to_db_id = {}
nprograms = 0
Copied: trunk/base/src/xml.py (from r1267, /trunk/base/src/libxml2.py)
==============================================================================
--- /trunk/base/src/libxml2.py (original)
+++ trunk/base/src/xml.py Sat Mar 11 18:51:42 2006
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# libxml2.py - libxml2 wrapper for kaa
+# xml.py - libxml2 wrapper for kaa
# -----------------------------------------------------------------------------
# $Id$
#
Copied: trunk/base/test/xml.py (from r1267, /trunk/base/test/libxml2.py)
==============================================================================
--- /trunk/base/test/libxml2.py (original)
+++ trunk/base/test/xml.py Sat Mar 11 18:51:42 2006
@@ -1,7 +1,7 @@
import sys
-from kaa import libxml2
+from kaa import xml
-x = libxml2.Document(sys.argv[1], 'freevo')
+x = xml.Document(sys.argv[1], 'freevo')
for c in x.children:
print c.name, c.type, c.parent.name
@@ -20,9 +20,9 @@
-x = libxml2.Document(root='freevo')
+x = xml.Document(root='freevo')
-c = libxml2.Node('foo')
+c = xml.Node('foo')
c.content = "hallo"
x.add_child(c)
Modified: trunk/cherrypy/src/version.py
==============================================================================
--- trunk/cherrypy/src/version.py (original)
+++ trunk/cherrypy/src/version.py Sat Mar 11 18:51:42 2006
@@ -1,5 +1,5 @@
# version information for kaa-cherrypy
-# autogenerated by kaa.base.distribution
+# autogenerated by kaa.distribution
from kaa.version import Version
VERSION = Version('0.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:51:42 2006
@@ -37,7 +37,7 @@
# kaa imports
from kaa.metadata import factory
from kaa.metadata import mediainfo
-from kaa import libxml2
+from kaa import xml
# get logging object
log = logging.getLogger('metadata')
@@ -88,7 +88,7 @@
binsxml = filename + '.xml'
if not os.path.isfile(binsxml):
return
- xml = libxml2.Document(binsxml, 'image')
+ xml = xml.Document(binsxml, 'image')
for child in xml.get_child('description').children:
key = str(child.getattr('name'))
if not key or not child.content:
@@ -107,7 +107,7 @@
os.path.basename(filename) + '.xml')
if not os.path.isfile(comment_file):
return
- xml = libxml2.Document(comment_file, 'Comment')
+ xml = xml.Document(comment_file, 'Comment')
for child in xml.children:
if child.name == 'Place':
self.location = child.content
Modified: trunk/metadata/src/misc/dirinfo.py
==============================================================================
--- trunk/metadata/src/misc/dirinfo.py (original)
+++ trunk/metadata/src/misc/dirinfo.py Sat Mar 11 18:51:42 2006
@@ -37,7 +37,7 @@
# kaa imports
from kaa.strutils import unicode_to_str
-from kaa import libxml2
+from kaa import xml
from kaa.metadata.mediainfo import MediaInfo, MEDIACORE, \
EXTENSION_DIRECTORY, TYPE_MISC
from kaa.metadata.factory import register
@@ -89,7 +89,7 @@
if not os.path.isfile(binsxml):
return
- xml = libxml2.Document(binsxml, 'album')
+ xml = xml.Document(binsxml, 'album')
for child in xml.get_child('description').children:
key = str(child.getattr('name'))
if not key or not child.content:
Modified: trunk/metadata/src/misc/xmlinfo.py
==============================================================================
--- trunk/metadata/src/misc/xmlinfo.py (original)
+++ trunk/metadata/src/misc/xmlinfo.py Sat Mar 11 18:51:42 2006
@@ -32,7 +32,7 @@
# python imports
import os
import logging
-import libxml2
+import xml
# kaa imports
from kaa.metadata import factory
@@ -57,7 +57,7 @@
self.mime = 'text/xml'
self.type = ''
- libxml2.SAXParseFile(self, file.name, 10)
+ xml.SAXParseFile(self, file.name, 10)
def startElement(self, tag, attrs):
-------------------------------------------------------
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
