summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenni Lund <kenni@mythtv.org>2011-03-24 22:59:32 (GMT)
committer Kenni Lund <kenni@mythtv.org>2011-03-24 22:59:32 (GMT)
commit464fa2837373d5f0c9277482a06bbb871369f7b7 (patch)
tree8b6a45ff503dbd23de00465c106963c80eb28aad
parentc2baf1b223846e955db2b338ef36c9210329ca7a (diff)
Fix a bug which caused jamu to crash due to multiple unicode conversions.
Fixes #9637. ACKed by Doug Vaughan.
-rwxr-xr-xmythplugins/mythvideo/mythvideo/scripts/jamu.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mythplugins/mythvideo/mythvideo/scripts/jamu.py b/mythplugins/mythvideo/mythvideo/scripts/jamu.py
index fe5a9f8..65a52d1 100755
--- a/mythplugins/mythvideo/mythvideo/scripts/jamu.py
+++ b/mythplugins/mythvideo/mythvideo/scripts/jamu.py
@@ -47,7 +47,7 @@ Users of this script are encouraged to populate both themoviedb.com and thetvdb.
fan art and banners and meta data. The richer the source the more valuable the script.
'''
-__version__=u"v0.7.7"
+__version__=u"v0.7.8"
# 0.1.0 Initial development
# 0.2.0 Inital beta release
# 0.3.0 Add mythvideo metadata updating including movie graphics through
@@ -308,6 +308,8 @@ __version__=u"v0.7.7"
# 0.7.7 Pull hostname from python bindings instead of socket libraries
# Added support of unicode characters within a jamu.conf file
# Replace 'xml' module version check with generic Python version, to correct failure in Python 2.7
+ # 0.7.8 Fixed a bug which caused jamu to crash due to an extra unicode conversion introduced in 0.7.7.
+ # See also #9637.
usage_txt=u'''
@@ -1279,12 +1281,12 @@ class Configuration(object):
if section == 'regex':
# Change variables per user config file
for option in cfg.options(section):
- self.config['name_parse'].append(re.compile(unicode(cfg.get(section, option), 'utf8'), re.UNICODE))
+ self.config['name_parse'].append(re.compile(cfg.get(section, option), re.UNICODE))
continue
if section == 'ignore-directory':
# Video directories to be excluded from Jamu processing
for option in cfg.options(section):
- self.config['ignore-directory'].append(unicode(cfg.get(section, option), 'utf8'))
+ self.config['ignore-directory'].append(cfg.get(section, option))
continue
if section =='series_name_override':
overrides = {}