Merge branch 'release/v2.1.1'v2.1.1

1 files changed, 7 insertions, 2 deletions

diff --git a/glances/core/glances_client.py b/glances/core/glances_client.py
index faf70ae1..a0e76bf1 100644
--- a/glances/core/glances_client.py
+++ b/glances/core/glances_client.py
@@ -25,9 +25,14 @@ import socket
 import sys
 try:
     from xmlrpc.client import Transport, ServerProxy, ProtocolError, Fault
-except ImportError:  # Python 2
+except ImportError:  
+    # Python 2
     from xmlrpclib import Transport, ServerProxy, ProtocolError, Fault
-import httplib
+try:
+    import http.client as httplib
+except:  
+    # Python 2
+    import httplib
 
 # Import Glances libs
 from glances.core.glances_globals import version, logger