From e7dc5ac8d4515417d4737163fbf151b5ba3941ca Mon Sep 17 00:00:00 2001
From: Joakim Hamren <joakim.hamren@gmail.com>
Date: Sat, 6 Sep 2014 15:55:30 +0200
Subject: [PATCH] Made some character encoding fixes

---
 psdash/node.py                            | 2 +-
 psdash/templates/index.html               | 6 +++---
 psdash/templates/logs.html                | 6 +++++-
 psdash/templates/network.html             | 2 +-
 psdash/templates/process/environment.html | 4 ++--
 psdash/templates/process/overview.html    | 4 ++--
 psdash/templates/processes.html           | 4 +++-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/psdash/node.py b/psdash/node.py
index 219042d..ed60556 100644
--- a/psdash/node.py
+++ b/psdash/node.py
@@ -325,7 +325,7 @@ def get_logs(self):
             try:
                 stat = os.stat(log.filename)
                 available_logs.append({
-                    'path': log.filename,
+                    'path': log.filename.encode("utf-8"),
                     'size': stat.st_size,
                     'atime': stat.st_atime,
                     'mtime': stat.st_mtime
diff --git a/psdash/templates/index.html b/psdash/templates/index.html
index e6e15c3..96f41b3 100644
--- a/psdash/templates/index.html
+++ b/psdash/templates/index.html
@@ -39,7 +39,7 @@
                         <tbody>
                             {% for u in users %}
                                 <tr>
-                                    <td>{{ u.name }}</td>
+                                    <td>{{ u.name.decode("utf-8") }}</td>
                                     <td>{{ u.started|fromtimestamp }}</td>
                                     <td>{{ u.host }}</td>
                                 </tr>
@@ -56,7 +56,7 @@
                     <table class="cpu table table-striped table-bordered">
                         <tr>
                             <td class="label-col">Load average</td>
-                            <td class="load" style="word-spacing: 10px;">{{ load_avg[0] }} {{ load_avg[1] }} {{ load_avg[2] }}</td>
+                            <td class="load" style="word-spacing: 10px;">{{ load_avg[0]|round(2) }} {{ load_avg[1]|round(2) }} {{ load_avg[2]|round(2) }}</td>
                         </tr>
                         <tr>
                             <td class="label-col">User</td>
@@ -148,7 +148,7 @@
                         <tbody>
                             {% for ni in net_interfaces %}
                                 <tr>
-                                    <td>{{ ni.name }}</td>
+                                    <td>{{ ni.name.decode("utf-8") }}</td>
                                     <td>{{ ni.ip }}</td>
                                     <td>{{ ni.send_rate|default(0)|filesizeformat }}</td>
                                     <td>{{ ni.recv_rate|default(0)|filesizeformat }}</td>
diff --git a/psdash/templates/logs.html b/psdash/templates/logs.html
index a7f46e3..9cca012 100644
--- a/psdash/templates/logs.html
+++ b/psdash/templates/logs.html
@@ -17,7 +17,11 @@
             <tbody>
                 {% for log in logs %}
                 <tr>
-                    <td><a href="{{ url_for(".view_log", filename=log.path) }}">{{ log.path }}</a></td>
+                    <td>
+                        <a href="{{ url_for(".view_log", filename=log.path.decode("utf-8")) }}">
+                            {{ log.path.decode("utf-8") }}
+                        </a>
+                    </td>
                     <td>{{ log.size|filesizeformat }}</td>
                     <td>{{ log.atime|fromtimestamp }}</td>
                     <td>{{ log.mtime|fromtimestamp }}</td>
diff --git a/psdash/templates/network.html b/psdash/templates/network.html
index 72c1f72..8dcad78 100644
--- a/psdash/templates/network.html
+++ b/psdash/templates/network.html
@@ -22,7 +22,7 @@
             <tbody>
                 {% for io in network_interfaces %}
                 <tr>
-                    <td>{{ io.name }}</td>
+                    <td>{{ io.name.decode("utf-8") }}</td>
                     <td>{{ io.ip }}</td>
                     <td>{{ io.bytes_sent }}</td>
                     <td>{{ io.bytes_recv }}</td>
diff --git a/psdash/templates/process/environment.html b/psdash/templates/process/environment.html
index 4038779..60d2be7 100644
--- a/psdash/templates/process/environment.html
+++ b/psdash/templates/process/environment.html
@@ -10,8 +10,8 @@
         <tbody>
             {% for var, value in process_environ.iteritems() %}
                 <tr>
-                    <td>{{ var }}</td>
-                    <td>{{ value }}</td>
+                    <td>{{ var.decode("utf-8") }}</td>
+                    <td>{{ value.decode("utf-8") }}</td>
                 </tr>
             {% endfor %}
         </tbody>
diff --git a/psdash/templates/process/overview.html b/psdash/templates/process/overview.html
index 75fece6..746ddf2 100644
--- a/psdash/templates/process/overview.html
+++ b/psdash/templates/process/overview.html
@@ -14,7 +14,7 @@
     <tr>
         <td>Command</td>
         <td>
-            {{ process.cmdline }}
+            {{ process.cmdline.decode("utf-8") }}
         </td>
     </tr>
     <tr>
@@ -113,7 +113,7 @@
     </tr>
     <tr>
         <td>CWD</td>
-        <td>{{ process.cwd }}</td>
+        <td>{{ process.cwd.decode("utf-8") }}</td>
     </tr>
     <tr>
         <td># File-descriptors</td>
diff --git a/psdash/templates/processes.html b/psdash/templates/processes.html
index ef235c9..bd747b2 100644
--- a/psdash/templates/processes.html
+++ b/psdash/templates/processes.html
@@ -53,7 +53,9 @@
                 {% for p in processes %}
                     <tr>
                       <td>{{ p.pid }}</td>
-                      <td title="{{ p.cmdline }}"><a href="{{ url_for(".process", pid=p.pid) }}">{{ p.name }}</a></td>
+                      <td title="{{ p.cmdline.decode("utf-8") }}">
+                          <a href="{{ url_for(".process", pid=p.pid) }}">{{ p.name.decode("utf-8") }}</a>
+                      </td>
                       <td>{{ p.user }}</td>
                       <td>{{ p.status }}</td>
                       <td>{{ p.created|fromtimestamp }}</td>