[Python-apps-commits] r12577 - in packages/gitinspector/trunk/debian/patches (1 file)

[ckk at users.alioth.debian.org]

    Date: Sunday, November 8, 2015 @ 13:16:46
  Author: ckk
Revision: 12577

d/patches: Update Use-jQuery-libraries-from-the-Debian-archive.patch

Modified:
  packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch

Modified: packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2015-11-08 13:15:59 UTC (rev 12576)
+++ packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2015-11-08 13:16:46 UTC (rev 12577)
@@ -8,11 +8,11 @@
  gitinspector/format.py | 26 +++++++++++++++-----------
  1 file changed, 15 insertions(+), 11 deletions(-)
 
-Index: gitinspector-0.4.1/gitinspector/format.py
+Index: gitinspector-0.4.3/gitinspector/format.py
 ===================================================================
---- gitinspector-0.4.1.orig/gitinspector/format.py
-+++ gitinspector-0.4.1/gitinspector/format.py
-@@ -57,21 +57,23 @@ def __output_html_template__(name):
+--- gitinspector-0.4.3.orig/gitinspector/format.py
++++ gitinspector-0.4.3/gitinspector/format.py
+@@ -57,22 +57,23 @@ def __output_html_template__(name):
  	file_r = open(template_path, "rb")
  	return file_r.read().decode("utf-8", "replace")
  
@@ -26,7 +26,8 @@
  	if __selected_format__ == "html" or __selected_format__ == "htmlembedded":
  		base = basedir.get_basedir()
  		html_header = __output_html_template__(base + "/html/html.header")
--		tablesorter_js = __get_zip_file_content__("jquery.tablesorter.min.js", "/html/jquery.tablesorter.min.js.zip").encode("latin-1", "replace")
+-		tablesorter_js = __get_zip_file_content__("jquery.tablesorter.min.js",
+-		                                          "/html/jquery.tablesorter.min.js.zip").encode("latin-1", "replace")
 -		tablesorter_js = tablesorter_js.decode("utf-8", "ignore")
 -		flot_js = __get_zip_file_content__("jquery.flot.js")
 -		pie_js = __get_zip_file_content__("jquery.flot.pie.js")
@@ -37,23 +38,23 @@
 +		resize_js = None
 +		jquery_js = None
 +		with open('/usr/share/javascript/jquery-tablesorter/jquery.tablesorter.js') as js:
-+			tablersorter_js = js.read()
++			tablersorter_js = js.read().decode("utf-8", "replace")
 +		with open('/usr/share/javascript/jquery-flot/jquery.flot.js') as js:
-+			flot_js = js.read()
++			flot_js = js.read().decode("utf-8", "replace")
 +		with open('/usr/share/javascript/jquery-flot/jquery.flot.pie.js') as js:
-+			pie_js = js.read()
++			pie_js = js.read().decode("utf-8", "replace")
 +		with open('/usr/share/javascript/jquery-flot/jquery.flot.resize.js') as js:
-+			resize_js = js.read()
++			resize_js = js.read().decode("utf-8", "replace")
  
  		logo_file = open(base + "/html/gitinspector_piclet.png", "rb")
  		logo = logo_file.read()
-@@ -79,7 +81,8 @@ def output_header():
+@@ -80,7 +81,8 @@ def output_header():
  		logo = base64.b64encode(logo)
  
  		if __selected_format__ == "htmlembedded":
 -			jquery_js = ">" + __get_zip_file_content__("jquery.js")
 +			with open('/usr/share/javascript/jquery/jquery.js') as js:
-+				jquery_js = ">" + js.read()
++				jquery_js = ">" + js.read().decode("utf-8", "replace")
  		else:
  			jquery_js = " src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">"