Remove support for Python 2.6.

.travis.yml

@@ -7,7 +7,6 @@ env:
   - TOX_ENV=py34-lint
   - TOX_ENV=py27-lint-readme
   - TOX_ENV=lint-docs
-  - TOX_ENV=py26 SETUP=true
   - TOX_ENV=py27 SETUP=true
   - TOX_ENV=py34 SETUP=true
   - TOX_ENV=py34-unit SETUP=true

dev-requirements.txt

@@ -10,9 +10,6 @@ coverage
 # For dev
 sphinx==1.2
 
-# For Python 2.6 tests
-unittest2
-
 # Used for code checking.
 pyflakes
 flake8

pulsar/main.py

@@ -36,31 +36,8 @@ try:
 except ImportError:
     Daemonize = None
 
-# Vaguely Python 2.6 compatibile ArgumentParser import
-try:
-    from argparse import ArgumentParser
-    from argparse import RawDescriptionHelpFormatter
-except ImportError:
-    from optparse import OptionParser
-
-    class ArgumentParser(OptionParser):
-
-        def __init__(self, **kwargs):
-            if "formatter_class" in kwargs:
-                del kwargs["formatter_class"]
-            self.delegate = OptionParser(**kwargs)
-
-        def add_argument(self, *args, **kwargs):
-            if "required" in kwargs:
-                del kwargs["required"]
-            return self.delegate.add_option(*args, **kwargs)
-
-        def parse_args(self, args=None):
-            (options, args) = self.delegate.parse_args(args)
-            return options
-
-    RawDescriptionHelpFormatter = None
-
+from argparse import ArgumentParser
+from argparse import RawDescriptionHelpFormatter
 
 log = logging.getLogger(__name__)
 

test/test_utils.py

@@ -29,10 +29,7 @@ from pulsar.tools import ToolBox
 from pulsar.managers.base import JobDirectory
 from pulsar.web.framework import file_response
 
-if version_info < (2, 7):
-    from unittest2 import TestCase, skip
-else:
-    from unittest import TestCase, skip
+from unittest import TestCase, skip
 
 try:
     from nose.tools import nottest

tox.ini

 [tox]
-envlist = py27-lint, py27-lint-readme, lint-docs, py34-lint, py26, py27, py34, py34-unit
+envlist = py27-lint, py27-lint-readme, lint-docs, py34-lint,  py27, py34, py34-unit
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]