Author: duncan
Date: Sun Feb 18 12:56:21 2007
New Revision: 9238
Added:
branches/rel-1/freevo/contrib/plugins/
- copied from r9237, /branches/rel-1-6/freevo/contrib/plugins/
Modified:
branches/rel-1/freevo/src/util/__init__.py
branches/rel-1/freevo/src/util/videothumb.py
Log:
Merged changes from rel-1.6 branch
Modified: branches/rel-1/freevo/src/util/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/util/__init__.py (original)
+++ branches/rel-1/freevo/src/util/__init__.py Sun Feb 18 12:56:21 2007
@@ -5,11 +5,11 @@
# $Id$
#
# Notes:
-# Todo:
+# Todo:
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
-# Copyright (C) 2002 Krister Lagerstrom, et al.
+# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
print e
elif string.__class__ != unicode:
return unicode(str(string), config.LOCALE)
-
+
return string
@@ -68,7 +68,7 @@
return unicode(string).encode(encoding, 'replace')
return string
-
+
import vfs
from misc import *
from fileops import *
@@ -76,7 +76,7 @@
import fxdparser
import objectcache
import popen3
-
+
__builtin__.__dict__['vfs'] = vfs
__builtin__.__dict__['Unicode'] = Unicode
__builtin__.__dict__['String'] = String
Modified: branches/rel-1/freevo/src/util/videothumb.py
==============================================================================
--- branches/rel-1/freevo/src/util/videothumb.py (original)
+++ branches/rel-1/freevo/src/util/videothumb.py Sun Feb 18 12:56:21 2007
@@ -176,10 +176,10 @@
except:
print 'unable to write file'
else:
- print "error creating capture for %s" % filename
+ print "error creating capture for %s" % Unicode(filename)
for capture in captures:
try:
os.remove(capture)
except:
- print "error removing temporary captures for %s" % filename
+ print "error removing temporary captures for %s" %
Unicode(filename)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
