diff options
| author | Paul Berry <stereotype441@gmail.com> | 2011-08-08 09:04:00 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2011-08-11 13:09:30 -0700 |
| commit | da3126ce20538c0906226c62c089be4965aa2e41 (patch) | |
| tree | 56062c3cc2ed180bcc72b803606352a7360f229e | |
| parent | 4da714cd47e8a993ce26a572dd05fe8107950d46 (diff) | |
Changed piglit-summary-html to explicitly encode its output as UTF-8.
Previously piglit-summary-html didn't explicitly encode its output at
all--it relied on the default behavior of the Python file.write()
method (which, in Python 2.x, is to write 8-bit strings verbatim and
to encode unicode strings using ASCII). This meant that if a
non-ASCII character appeared in any of the test data,
piglit-summary-html would fail with an exception.
This patch changes piglit-summary-html to explicitly encode its output
using UTF-8. It also updates all of the HTML templates to specify
UTF-8 as the encoding, so that when results are viewed in a web
browser, non-ASCII characters will display correctly.
| -rwxr-xr-x | piglit-summary-html.py | 2 | ||||
| -rw-r--r-- | templates/index.html | 1 | ||||
| -rw-r--r-- | templates/result.html | 1 | ||||
| -rw-r--r-- | templates/testrun.html | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/piglit-summary-html.py b/piglit-summary-html.py index 63d8b60b..726319cf 100755 --- a/piglit-summary-html.py +++ b/piglit-summary-html.py @@ -50,7 +50,7 @@ def readfile(filename): def writefile(filename, text): f = open(filename, "w") - f.write(text) + f.write(text.encode('utf-8')) f.close() templatedir = os.path.join(os.path.dirname(__file__), 'templates') diff --git a/templates/index.html b/templates/index.html index d6bf392d..ff347df5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,6 @@ <html> <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Result summary </title> <link rel="stylesheet" href="index.css"/> </head> diff --git a/templates/result.html b/templates/result.html index d6167e7b..f90ff3d7 100644 --- a/templates/result.html +++ b/templates/result.html @@ -1,5 +1,6 @@ <html> <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>%(path)s - Details</title> <link rel="stylesheet" href="../result.css"/> </head> diff --git a/templates/testrun.html b/templates/testrun.html index a04ec0d0..572381f3 100644 --- a/templates/testrun.html +++ b/templates/testrun.html @@ -1,5 +1,6 @@ <html> <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>%(name)s - System info</title> <link rel="stylesheet" href="../result.css"/> </head> |