raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

updated vlc.py

Browse Source 
bzr-revno: 2219
This commit is contained in:
Andreas Preikschat 2013-03-26 21:25:51 +01:00
commit fbff7d70ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/media/vendor/vlc.py vendored
View File

@ -48,7 +48,7 @@ import sys
from inspect import getargspec from inspect import getargspec
__version__ = "N/A" __version__ = "N/A"
build_date = "Wed Feb 13 18:40:24 2013" build_date = "Thu Mar 21 22:33:03 2013"
if sys.version_info[0] > 2: if sys.version_info[0] > 2:
str = str str = str
@ -70,7 +70,7 @@ if sys.version_info[0] > 2:
if isinstance(b, bytes): if isinstance(b, bytes):
return b.decode(sys.getfilesystemencoding()) return b.decode(sys.getfilesystemencoding())
else: else:
return b return str(b)
else: else:
str = str str = str
unicode = unicode unicode = unicode
@ -90,6 +90,8 @@ else:
""" """
if isinstance(b, str): if isinstance(b, str):
return unicode(b, sys.getfilesystemencoding()) return unicode(b, sys.getfilesystemencoding())
else:
return b
# Internal guard to prevent internal classes to be directly # Internal guard to prevent internal classes to be directly
# instanciated. # instanciated.