Fix python 2.6 compatibility

Add argparse as requirement when running on python 2.6.
pull/354/head
Alessio Sergi 2014-04-15 16:55:16 +02:00
parent 9cf956b881
commit 45d6b2521b
3 changed files with 10 additions and 8 deletions

View File

@ -59,9 +59,9 @@ class Plugin(GlancesPlugin):
# Build the string message
# Header
msg = "{} {}".format(__appname__.title(), __version__)
msg = "{0} {1}".format(__appname__.title(), __version__)
ret.append(self.curse_add_line(msg, "TITLE"))
msg = " {} {}".format(_("with PsUtil"), __psutil_version__)
msg = " {0} {1}".format(_("with psutil"), __psutil_version__)
ret.append(self.curse_add_line(msg))
ret.append(self.curse_new_line())

View File

@ -65,7 +65,7 @@ class Plugin(GlancesPlugin):
ret = []
# Add the line with decoration
ret.append(self.curse_add_line(_("Uptime: {}").format(self.stats)))
ret.append(self.curse_add_line(_("Uptime: {0}").format(self.stats)))
# Return the message with decoration
return ret

View File

@ -8,8 +8,7 @@ from setuptools import setup
data_files = [
('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
'conf/glances.conf', 'docs/glances-doc.rst',
'docs/glances-doc.html']),
'conf/glances.conf', 'docs/glances-doc.html']),
('share/doc/glances/images', glob.glob('docs/images/*.png')),
('share/man/man1', ['man/glances.1'])
]
@ -32,6 +31,9 @@ if sys.platform.startswith('win'):
else:
requires = ['psutil>=2.0.0']
if sys.version_info < (2, 7):
requires += ['argparse']
setup(
name='Glances',
version='2.0',