No more Python 2.6 compatible string.format calls

5 files changed, 17 insertions, 17 deletions

diff --git a/glances/amps/glances_amp.py b/glances/amps/glances_amp.py
index ae4c7d4d..b59789b2 100644
--- a/glances/amps/glances_amp.py
+++ b/glances/amps/glances_amp.py
@@ -48,7 +48,7 @@ class GlancesAmp(object):
 
     def __init__(self, name=None, args=None):
         """Init AMP classe."""
-        logger.debug("Init {0} version {1}".format(self.NAME, self.VERSION))
+        logger.debug("Init {} version {}".format(self.NAME, self.VERSION))
 
         # AMP name (= module name without glances_)
         if name is None:
@@ -86,7 +86,7 @@ class GlancesAmp(object):
         amp_section = 'amp_' + self.amp_name
         if (hasattr(config, 'has_section') and
                 config.has_section(amp_section)):
-            logger.debug("{0}: Load configuration".format(self.NAME))
+            logger.debug("{}: Load configuration".format(self.NAME))
             for param, _ in config.items(amp_section):
                 try:
                     self.configs[param] = config.get_float_value(amp_section, param)
@@ -94,9 +94,9 @@ class GlancesAmp(object):
                     self.configs[param] = config.get_value(amp_section, param).split(',')
                     if len(self.configs[param]) == 1:
                         self.configs[param] = self.configs[param][0]
-                logger.debug("{0}: Load parameter: {1} = {2}".format(self.NAME, param, self.configs[param]))
+                logger.debug("{}: Load parameter: {} = {}".format(self.NAME, param, self.configs[param]))
         else:
-            logger.debug("{0}: Can not find section {1} in the configuration file".format(self.NAME, self.amp_name))
+            logger.debug("{}: Can not find section {} in the configuration file".format(self.NAME, self.amp_name))
             return False
 
         # enable, regex and refresh are mandatories
@@ -104,10 +104,10 @@ class GlancesAmp(object):
         if self.enable():
             for k in ['regex', 'refresh']:
                 if k not in self.configs:
-                    logger.warning("{0}: Can not find configuration key {1} in section {2}".format(self.NAME, k, self.amp_name))
+                    logger.warning("{}: Can not find configuration key {} in section {}".format(self.NAME, k, self.amp_name))
                     self.configs['enable'] = 'false'
         else:
-            logger.warning("{0} is disabled".format(self.NAME))
+            logger.warning("{} is disabled".format(self.NAME))
 
         # Init the count to 0
         self.configs['count'] = 0
diff --git a/glances/amps/glances_default.py b/glances/amps/glances_default.py
index 3c6294a3..7392d796 100644
--- a/glances/amps/glances_default.py
+++ b/glances/amps/glances_default.py
@@ -59,11 +59,11 @@ class Amp(GlancesAmp):
     def update(self, process_list):
         """Update the AMP"""
         # Get the systemctl status
-        logger.debug('{0}: Update stats using service {1}'.format(self.NAME, self.get('service_cmd')))
+        logger.debug('{}: Update stats using service {}'.format(self.NAME, self.get('service_cmd')))
         try:
             res = self.get('command')
         except OSError as e:
-            logger.debug('{0}: Error while executing service ({1})'.format(self.NAME, e))
+            logger.debug('{}: Error while executing service ({})'.format(self.NAME, e))
         else:
             if res is not None:
                 msg = u(check_output(res.split(), stderr=STDOUT))
@@ -71,7 +71,7 @@ class Amp(GlancesAmp):
             else:
                 # Set the default message if command return None
                 # Default sum of CPU and MEM for the matching regex
-                self.set_result('CPU: {0:.1f}% | MEM: {1:.1f}%'.format(
+                self.set_result('CPU: {:.1f}% | MEM: {:.1f}%'.format(
                     sum([p['cpu_percent'] for p in process_list]),
                     sum([p['memory_percent'] for p in process_list])))
 
diff --git a/glances/amps/glances_nginx.py b/glances/amps/glances_nginx.py
index a26c2044..da665cc1 100644
--- a/glances/amps/glances_nginx.py
+++ b/glances/amps/glances_nginx.py
@@ -76,12 +76,12 @@ class Amp(GlancesAmp):
     def update(self, process_list):
         """Update the AMP"""
         # Get the Nginx status
-        logger.debug('{0}: Update stats using status URL {1}'.format(self.NAME, self.get('status_url')))
+        logger.debug('{}: Update stats using status URL {}'.format(self.NAME, self.get('status_url')))
         res = requests.get(self.get('status_url'))
         if res.ok:
             # u'Active connections: 1 \nserver accepts handled requests\n 1 1 1 \nReading: 0 Writing: 1 Waiting: 0 \n'
             self.set_result(res.text.rstrip())
         else:
-            logger.debug('{0}: Can not grab status URL {1} ({2})'.format(self.NAME, self.get('status_url'), res.reason))
+            logger.debug('{}: Can not grab status URL {} ({})'.format(self.NAME, self.get('status_url'), res.reason))
 
         return self.result()
diff --git a/glances/amps/glances_systemd.py b/glances/amps/glances_systemd.py
index 073dbc00..5bee568d 100644
--- a/glances/amps/glances_systemd.py
+++ b/glances/amps/glances_systemd.py
@@ -68,11 +68,11 @@ class Amp(GlancesAmp):
     def update(self, process_list):
         """Update the AMP"""
         # Get the systemctl status
-        logger.debug('{0}: Update stats using systemctl {1}'.format(self.NAME, self.get('systemctl_cmd')))
+        logger.debug('{}: Update stats using systemctl {}'.format(self.NAME, self.get('systemctl_cmd')))
         try:
             res = check_output(self.get('systemctl_cmd').split())
         except OSError as e:
-            logger.debug('{0}: Error while executing systemctl ({1})'.format(self.NAME, e))
+            logger.debug('{}: Error while executing systemctl ({})'.format(self.NAME, e))
         else:
             status = {}
             # For each line
@@ -89,7 +89,7 @@ class Amp(GlancesAmp):
             # Build the output (string) message
             output = 'Services\n'
             for k, v in iteritems(status):
-                output += '{0}: {1}\n'.format(k, v)
+                output += '{}: {}\n'.format(k, v)
             self.set_result(output, separator=' ')
 
         return self.result()
diff --git a/glances/amps/glances_systemv.py b/glances/amps/glances_systemv.py
index 79e93e84..e46eded9 100644
--- a/glances/amps/glances_systemv.py
+++ b/glances/amps/glances_systemv.py
@@ -67,11 +67,11 @@ class Amp(GlancesAmp):
     def update(self, process_list):
         """Update the AMP"""
         # Get the systemctl status
-        logger.debug('{0}: Update stats using service {1}'.format(self.NAME, self.get('service_cmd')))
+        logger.debug('{}: Update stats using service {}'.format(self.NAME, self.get('service_cmd')))
         try:
             res = check_output(self.get('service_cmd').split(), stderr=STDOUT)
         except OSError as e:
-            logger.debug('{0}: Error while executing service ({1})'.format(self.NAME, e))
+            logger.debug('{}: Error while executing service ({})'.format(self.NAME, e))
         else:
             status = {'running': 0, 'stopped': 0, 'upstart': 0}
             # For each line
@@ -89,7 +89,7 @@ class Amp(GlancesAmp):
             # Build the output (string) message
             output = 'Services\n'
             for k, v in iteritems(status):
-                output += '{0}: {1}\n'.format(k, v)
+                output += '{}: {}\n'.format(k, v)
             self.set_result(output, separator=' ')
 
         return self.result()