diff --git a/.travis.yml b/.travis.yml index b35455bba7f1a5323b4840c330c3532d35c92d43..6e001873ac1807d961b6b8ecbf0c96ca815a7823 100644 --- a/.travis.yml +++ b/.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 diff --git a/dev-requirements.txt b/dev-requirements.txt index c946afb691dec465f00d8b10a2864004649e6da1..995599d6caa4c8cf84658f4dc1ab8cb846a5d31c 100644 --- a/dev-requirements.txt +++ b/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 diff --git a/pulsar/main.py b/pulsar/main.py index cd132951828193379bbbe61be57d61009c1b7186..56a596b54966d62b7fdca4bda0fa889332d1de39 100644 --- a/pulsar/main.py +++ b/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__) diff --git a/test/test_utils.py b/test/test_utils.py index 6e11a31857ac4b04cf402d87f432fb99c483e1de..b3788023c85a713b543e06769dbf168c62616b71 100644 --- a/test/test_utils.py +++ b/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 diff --git a/tox.ini b/tox.ini index dfc65935d014477d7765cf84626f6492ec390a8e..48e9df037ec6aeca15988ab9b60fa17fa00d93d8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [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]