webui: utf8 encoding fixes for python3 - fixes #2842

tvheadend · May 14, 2015 · 1a6ba12 · 1a6ba12
1 parent 679b779
commit 1a6ba12
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
@@ -633,7 +633,7 @@
  *
  * Style sheets for Grid RowActions Plugin
  *
- * @author   Ing. Jozef Sakáloš
+ * @author   Ing. Jozef Sakalos
  * @date     27. March 2008
  * @verson   $Id: Ext.ux.grid.RowActions.css 140 2008-04-06 01:24:10Z jozo $
  *
@@ -716,8 +716,8 @@
  *
  * Ext.ux.form.LovCombo CSS File
  *
- * @author    Ing.Jozef Sakáloš
- * @copyright (c) 2008, by Ing. Jozef Sakáloš
+ * @author    Ing.Jozef Sakalos
+ * @copyright (c) 2008, by Ing. Jozef Sakalos
  * @date      5. April 2008
  * @version   $Id: Ext.ux.form.LovCombo.css 189 2008-04-16 21:01:06Z jozo $
  *

diff --git a/src/webui/static/lovcombo/css/Ext.ux.form.LovCombo.css b/src/webui/static/lovcombo/css/Ext.ux.form.LovCombo.css
@@ -2,8 +2,8 @@
  *
  * Ext.ux.form.LovCombo CSS File
  *
- * @author    Ing.Jozef Sakáloš
- * @copyright (c) 2008, by Ing. Jozef Sakáloš
+ * @author    Ing.Jozef Sakalos
+ * @copyright (c) 2008, by Ing. Jozef Sakalos
  * @date      5. April 2008
  * @version   $Id: Ext.ux.form.LovCombo.css 189 2008-04-16 21:01:06Z jozo $
  *

diff --git a/src/webui/static/lovcombo/css/lovcombo.css b/src/webui/static/lovcombo/css/lovcombo.css
@@ -2,8 +2,8 @@
  *
  * Ext.ux.form.LovCombo Example Application CSS File
  *
- * @author    Ing.Jozef Sakáloš
- * @copyright (c) 2008, by Ing. Jozef Sakáloš
+ * @author    Ing.Jozef Sakalos
+ * @copyright (c) 2008, by Ing. Jozef Sakalos
  * @date      16. April 2008
  * @version   $Id: lovcombo.css 194 2008-04-17 00:16:12Z jozo $
  *

diff --git a/support/css.py b/support/css.py
@@ -5,8 +5,12 @@
 
 import sys, os
 
+VERBOSE = len(os.environ['V'] or '') > 0
 TVHDIR = os.path.realpath('.')
 
+def info(fmt, *msg):
+  sys.stderr.write(" [INFO ] " + (fmt % msg) + '\n')
+
 def error(fmt, *msg):
   sys.stderr.write(" [ERROR] " + (fmt % msg) + '\n')
   sys.exit(1)
@@ -25,15 +29,17 @@ def url(fn):
     '../docresources':'../docresources',
   }
 
-  f = open(fn)
+  f = open(fn, 'rb')
   if fn[0] != '/':
     fn = os.path.join(os.environ['PWD'], fn)
   fn = os.path.normpath(fn)
+  if VERBOSE:
+    info('css: %s', fn)
   if not fn.startswith(TVHDIR):
     error('Wrong filename "%s"', fn)
   bd = os.path.dirname(fn)
   while 1:
-    l = f.readline()
+    l = f.readline().decode('utf8')
     if not l:
       break
     n = l