Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10190/src
Modified Files:
item.py
Log Message:
Fixes some bugs related to handling unicode internally.
NOTE: Many of the bugs are related to using str() everywhere, so please stop doing
that.
Index: item.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/item.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** item.py 5 Feb 2004 02:52:20 -0000 1.61
--- item.py 5 Feb 2004 05:44:26 -0000 1.62
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.62 2004/02/05 05:44:26 gsbarbieri
+ # Fixes some bugs related to handling unicode internally.
+ # NOTE: Many of the bugs are related to using str() everywhere, so please stop doing
that.
+ #
# Revision 1.61 2004/02/05 02:52:20 gsbarbieri
# Handle filenames internally as unicode objects.
***************
*** 286,289 ****
--- 290,301 ----
if self.parent.DIRECTORY_USE_MEDIAID_TAG_NAMES:
self.name = self.info['title'] or self.name
+ if type( self.name ) == str:
+ try:
+ self.name = unicode( self.name, config.encoding )
+ except UnicodeDecodeError, e:
+ _debug_( "WARNING: " + \
+ "Could not convert %s to unicode using
\"%s\" encoding: %s" % \
+ ( repr( self.name ), encoding, e )
+ )
except:
pass
***************
*** 501,507 ****
return self.__getitem__(attr)
else:
! try:
! return str(self.__getitem__(attr))
! except UnicodeEncodeError:
! return self.__getitem__( attr ).encode( config.encoding )
!
--- 513,525 ----
return self.__getitem__(attr)
else:
! r = self.__getitem__(attr)
! if type( r ) == str:
! try:
! r = unicode( r, config.encoding )
! except UnicodeDecodeError, e:
! _debug_( "WARNING: " + \
! "Could not convert %s to unicode using \"%s\" encoding:
%s" % \
! ( repr( directory ), encoding, e )
! )
!
! return r
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
