From 60bf962f37b58046aeb486b3c2e04c8b88551704 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sun, 10 Apr 2016 15:19:00 -0400
Subject: [PATCH] Remove support for Python 2.6.
---
.travis.yml | 1 -
dev-requirements.txt | 3 ---
pulsar/main.py | 27 ++-------------------------
test/test_utils.py | 5 +----
tox.ini | 2 +-
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b35455bb..6e001873 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 c946afb6..995599d6 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 cd132951..56a596b5 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 6e11a318..b3788023 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 dfc65935..48e9df03 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]
--
GitLab