From 94818371d96126028d907dcfac47f3cba8c0fe7c Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 28 Oct 2013 12:58:00 +0100
Subject: [PATCH 1/3] psutil 1.1.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 27c1c789..acb5bdb3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-psutil==1.1.0
+psutil==1.1.2

From 6c5b640e2f198256f2e2179f38874f381e92a555 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 28 Oct 2013 13:13:13 +0100
Subject: [PATCH 2/3] psutil releases are now hosted on PyPI

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index c85c77f8..c18a4fd8 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@
 .. image:: https://travis-ci.org/nicolargo/glances.png?branch=master
         :target: https://travis-ci.org/nicolargo/glances
 .. image:: https://badge.fury.io/py/Glances.png
-    :target: http://badge.fury.io/py/Glances
+        :target: http://badge.fury.io/py/Glances
 .. image:: https://pypip.in/d/Glances/badge.png
         :target: https://crate.io/packages/Glances
 
@@ -121,7 +121,7 @@ Thanks to Nicolas Bourges, Glances can be easily installed using a Windows insta
 Otherwise, you have to follow these steps:
 
 - Install Python for Windows: http://www.python.org/getit/
-- Install the psutil library: https://code.google.com/p/psutil/downloads/list
+- Install the psutil library: https://pypi.python.org/pypi?:action=display&name=psutil#downloads
 - Install the colorconsole library: http://code.google.com/p/colorconsole/downloads/list
 - Download Glances from here: http://nicolargo.github.io/glances/
 

From 9a8552eb3fd3ed1474876650d594bb11a03c2a29 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 30 Oct 2013 13:03:00 +0100
Subject: [PATCH 3/3] UTF-8 config file for python 3 [issue #295]

---
 glances/glances.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/glances/glances.py b/glances/glances.py
index 93b88cb6..8845baf0 100644
--- a/glances/glances.py
+++ b/glances/glances.py
@@ -387,7 +387,15 @@ class Config:
         """
         for path in self.get_paths_list():
             if os.path.isfile(path) and os.path.getsize(path) > 0:
-                self.parser.read(path)
+                try:
+                    if sys.version_info >= (3, 2):
+                        self.parser.read(path, encoding='utf-8')
+                    else:
+                        self.parser.read(path)
+                except UnicodeDecodeError as e:
+                    print(_("Error decoding config file '%s': %s") % (path, e))
+                    sys.exit(1)
+
                 break
 
     def get_paths_list(self):