summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR.D. Vaughan <r.d.vaughan@rogers.com>2011-08-18 14:50:45 (GMT)
committer Raymond Wagner <rwagner@mythtv.org>2011-08-20 07:28:05 (GMT)
commitd282ee21436ad2be8bc2824a8534ae2df8046a89 (patch)
tree2b6fef4e66e06cbd8bed43b8825f0d9c807a2b99
parent56553026aca646c8207d150a338c341bc941b79b (diff)
Fixed Jamu unnecessary unicode declarations
Removed unnecessary unicode character conversions when data comes from a jamu.conf file
-rwxr-xr-xmythplugins/mythvideo/mythvideo/scripts/jamu.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mythplugins/mythvideo/mythvideo/scripts/jamu.py b/mythplugins/mythvideo/mythvideo/scripts/jamu.py
index 65a52d1..7213585 100755
--- a/mythplugins/mythvideo/mythvideo/scripts/jamu.py
+++ b/mythplugins/mythvideo/mythvideo/scripts/jamu.py
@@ -310,6 +310,7 @@ __version__=u"v0.7.8"
# 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.
+ # Removed unnecessary unicode character conversions when data comes from a jamu.conf file
usage_txt=u'''
@@ -1765,7 +1766,7 @@ http://www.pythonware.com/products/pil/\nError:(%s)\n""" % e)
else:
if self.config['series_name_override']:
if self.config['series_name_override'].has_key(args[0].lower()):
- self.config['sid'] = unicode((self.config['series_name_override'][args[0].lower()]).strip(), 'utf8')
+ self.config['sid'] = self.config['series_name_override'][args[0].lower()].strip()
else:
self.config['series_name'] = unicode(args[0].strip(), 'utf8')
else:
@@ -1786,11 +1787,11 @@ http://www.pythonware.com/products/pil/\nError:(%s)\n""" % e)
else:
if self.config['ep_name_massage']:
if self.config['ep_name_massage'].has_key(self.config['series_name']):
- tmp_ep_name=args[1].strip()
+ tmp_ep_name=unicode(args[1].strip(), 'utf8')
tmp_array=self.config['ep_name_massage'][self.config['series_name']]
for pair in tmp_array:
tmp_ep_name = tmp_ep_name.replace(pair[0],pair[1])
- self.config['episode_name'] = unicode(tmp_ep_name, 'utf8')
+ self.config['episode_name'] = tmp_ep_name
else:
self.config['episode_name'] = unicode(args[1].strip(), 'utf8')
else: