Merge pull request #9 from heavenshell/feature_py26

Enable to run in Python2.6

3 files changed, 15 insertions, 8 deletions

diff --git a/cliff/app.py b/cliff/app.py
index 55420b5..2b60d34 100644
--- a/cliff/app.py
+++ b/cliff/app.py
@@ -70,7 +70,7 @@ class App(object):
         parser.add_argument(
             '--version',
             action='version',
-            version='%(prog)s {}'.format(version),
+            version='%(prog)s {0}'.format(version),
             )
         parser.add_argument(
             '-v', '--verbose',
diff --git a/setup.py b/setup.py
index f288684..377eb70 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,18 @@ try:
 except IOError:
     long_description = ''
 
+install_requires = ['distribute',
+                   # disabled until OpenStack catches up 'PrettyTable>=0.6',
+                   'PrettyTable',
+                   'cmd2',
+                   'tablib',
+                   ]
+try:
+    import argparse
+except ImportError:
+    install_requires.append('argparse')
+
+
 ##############################################################################
 # find_package_data is an Ian Bicking creation.
 
@@ -145,12 +157,7 @@ setup(
 
     provides=['cliff',
               ],
-    install_requires=['distribute',
-                      # disabled until OpenStack catches up 'PrettyTable>=0.6',
-                      'PrettyTable',
-                      'cmd2',
-                      'tablib',
-                      ],
+    install_requires=install_requires,
 
     namespace_packages=[],
     packages=find_packages(),
diff --git a/tox.ini b/tox.ini
index cfc251f..d3975b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py32,pep8
+envlist = py26,py27,py32,pep8
 
 [testenv]
 commands = nosetests -d --with-coverage --cover-inclusive --cover-package cliff []