Author: dmeyer
Date: Sun Mar 26 10:48:44 2006
New Revision: 1353
Modified:
trunk/metadata/src/image/core.py
trunk/metadata/src/mediainfo.py
trunk/metadata/src/misc/dirinfo.py
Log:
bugfix
Modified: trunk/metadata/src/image/core.py
==============================================================================
--- trunk/metadata/src/image/core.py (original)
+++ trunk/metadata/src/image/core.py Sun Mar 26 10:48:44 2006
@@ -88,8 +88,8 @@
binsxml = filename + '.xml'
if not os.path.isfile(binsxml):
return
- xml = xml.Document(binsxml, 'image')
- for child in xml.get_child('description').children:
+ doc = xml.Document(binsxml, 'image')
+ for child in doc.get_child('description').children:
key = str(child.getattr('name'))
if not key or not child.content:
continue
@@ -107,8 +107,8 @@
os.path.basename(filename) + '.xml')
if not os.path.isfile(comment_file):
return
- xml = xml.Document(comment_file, 'Comment')
- for child in xml.children:
+ doc = xml.Document(comment_file, 'Comment')
+ for child in doc.children:
if child.name == 'Place':
self.location = child.content
if child.name == 'Note':
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Sun Mar 26 10:48:44 2006
@@ -185,7 +185,7 @@
if self.__dict__.has_key(item):
if convert_to_str:
if not isinstance(dict[key], unicode):
- self.__dict__[item] = unicode(dict[key])
+ self.__dict__[item] = str_to_unicode(dict[key])
else:
self.__dict__[item] = dict[key]
else:
Modified: trunk/metadata/src/misc/dirinfo.py
==============================================================================
--- trunk/metadata/src/misc/dirinfo.py (original)
+++ trunk/metadata/src/misc/dirinfo.py Sun Mar 26 10:48:44 2006
@@ -89,8 +89,8 @@
if not os.path.isfile(binsxml):
return
- xml = xml.Document(binsxml, 'album')
- for child in xml.get_child('description').children:
+ doc = xml.Document(binsxml, 'album')
+ for child in doc.get_child('description').children:
key = str(child.getattr('name'))
if not key or not child.content:
continue
-------------------------------------------------------
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
