Merge compat into globals

4 files changed, 4 insertions, 4 deletions

diff --git a/glances/amps/glances_amp.py b/glances/amps/glances_amp.py
index ccbee541..5e6f31ac 100644
--- a/glances/amps/glances_amp.py
+++ b/glances/amps/glances_amp.py
@@ -32,7 +32,7 @@ The return string is a string with one or more line (\n between lines).
 If the *one_line* var is true then the AMP will be displayed in one line.
 """
 
-from glances.compat import u, b, n, nativestr
+from glances.globals import u, b, n, nativestr
 from glances.timer import Timer
 from glances.logger import logger
 
diff --git a/glances/amps/glances_default.py b/glances/amps/glances_default.py
index d942939a..faa49718 100644
--- a/glances/amps/glances_default.py
+++ b/glances/amps/glances_default.py
@@ -37,7 +37,7 @@ command=foo status
 
 from subprocess import check_output, STDOUT, CalledProcessError
 
-from glances.compat import u, to_ascii
+from glances.globals import u, to_ascii
 from glances.logger import logger
 from glances.amps.glances_amp import GlancesAmp
 
diff --git a/glances/amps/glances_systemd.py b/glances/amps/glances_systemd.py
index 993bfefc..5e34d90d 100644
--- a/glances/amps/glances_systemd.py
+++ b/glances/amps/glances_systemd.py
@@ -48,7 +48,7 @@ systemctl_cmd=/usr/bin/systemctl --plain
 from subprocess import check_output, CalledProcessError
 
 from glances.logger import logger
-from glances.compat import iteritems, to_ascii
+from glances.globals import iteritems, to_ascii
 from glances.amps.glances_amp import GlancesAmp
 
 
diff --git a/glances/amps/glances_systemv.py b/glances/amps/glances_systemv.py
index c28a4fde..836427e8 100644
--- a/glances/amps/glances_systemv.py
+++ b/glances/amps/glances_systemv.py
@@ -47,7 +47,7 @@ service_cmd=/usr/bin/service --status-all
 from subprocess import check_output, STDOUT
 
 from glances.logger import logger
-from glances.compat import iteritems
+from glances.globals import iteritems
 from glances.amps.glances_amp import GlancesAmp