3rd attempt to fix Python 2.6 testing bug.

1 files changed, 14 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index cdb52a0..6e9bc70 100644
--- a/setup.py
+++ b/setup.py
@@ -20,22 +20,22 @@ class PyTest(TestCommand):
 
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
+        import pytest
         if sys.version[:3] == '2.6':
-            flakes_pep8 = []
+            return pytest.main()
         else:
-            flakes_pep8 = ['--flakes', '--pep8']
-        import pytest
-        return pytest.main(flakes_pep8 +
-                           ['--cov', 'natsort',
-                            '--cov-report', 'term-missing',
-                            # '-s',
-                            # '--failed',
-                            # '-v',
-                            # 'test_natsort',
-                            # 'README.rst',
-                            # 'docs/source/intro.rst',
-                            # 'docs/source/examples.rst',
-                            ])
+            return pytest.main(['--cov', 'natsort',
+                                '--cov-report', 'term-missing',
+                                '--flakes',
+                                '--pep8',
+                                # '-s',
+                                # '--failed',
+                                # '-v',
+                                # 'test_natsort',
+                                # 'README.rst',
+                                # 'docs/source/intro.rst',
+                                # 'docs/source/examples.rst',
+                                ])
 
 
 # Read the natsort.py file for the module version number