openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/md5_hash_unicode into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/md5_hash_unicode/+merge/249253

Fix missed call to md5_hash in presentationcontroller
Originally part of hash_fix branch

lp:~alisonken1/openlp/md5_hash_unicode (revision 2498)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/938/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/864/
[FAILURE] http://ci.openlp.org/job/Branch-03-Interface-Tests/809/
Stopping after failure

Failed test is Crosswalk bible import.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/md5_hash_unicode into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py	2015-02-04 17:20:14 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py	2015-02-10 21:07:23 +0000
@@ -134,7 +134,7 @@
         """
         # TODO: If statment can be removed when the upgrade path from 2.0.x to 2.2.x is no longer needed
         if Settings().value('presentations/thumbnail_scheme') == 'md5':
-            folder = md5_hash(self.file_path)
+            folder = md5_hash(self.file_path.encode('utf-8'))
         else:
             folder = self.get_file_name()
         return os.path.join(self.controller.thumbnail_folder, folder)
@@ -145,7 +145,7 @@
         """
         # TODO: If statment can be removed when the upgrade path from 2.0.x to 2.2.x is no longer needed
         if Settings().value('presentations/thumbnail_scheme') == 'md5':
-            folder = md5_hash(self.file_path)
+            folder = md5_hash(self.file_path.encode('utf-8'))
         else:
             folder = folder = self.get_file_name()
         return os.path.join(self.controller.temp_folder, folder)