From 76aedad1ffe73afbdd683e02b6918fe5d5c59d76 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 14 Oct 2017 11:59:38 +0300 Subject: [PATCH 1/5] Remove commented 2.5, it's no longer supported --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fddae9303..8a29c4ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: false language: python python: -# - "2.5" - "2.6" - "2.7" From 2d605606b620ccd1c5eda843fc2131f10b10c7da Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 14 Oct 2017 12:01:10 +0300 Subject: [PATCH 2/5] Remove unsupported Python 2.4 and 2.5 --- tox.ini | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tox.ini b/tox.ini index 9a68efb7f..0b7750e5d 100644 --- a/tox.ini +++ b/tox.ini @@ -8,18 +8,6 @@ setenv = VIRTUAL_ENV={envdir} commands = {toxinidir}/test.py sitepackages = False -[testenv:py24] -deps = {[testenv]deps} - simplejson -setenv = - PIP_INSECURE = 1 - -[testenv:py25] -deps = {[testenv]deps} - simplejson -setenv = - PIP_INSECURE = 1 - [testenv:pep8] deps = pep8==1.5.7 commands = pep8 --config=.pep8 src bin/diamond bin/diamond-setup build_doc.py setup.py test.py From c115489ad1a100ad30e5b748083956e44c49bf1e Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 14 Oct 2017 12:03:16 +0300 Subject: [PATCH 3/5] Remove unsupported Python <= 2.5 --- src/diamond/utils/log.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/diamond/utils/log.py b/src/diamond/utils/log.py index 70f8be52e..25a663fe5 100644 --- a/src/diamond/utils/log.py +++ b/src/diamond/utils/log.py @@ -36,16 +36,7 @@ def setup_logging(configfile, stdout=False): log = logging.getLogger('diamond') try: - if sys.version_info >= (2, 6): - logging.config.fileConfig(configfile, - disable_existing_loggers=False) - else: - # python <= 2.5 does not have disable_existing_loggers - # default was to always disable them, in our case we want to - # keep any logger created by handlers - logging.config.fileConfig(configfile) - for logger in logging.root.manager.loggerDict.values(): - logger.disabled = 0 + logging.config.fileConfig(configfile, disable_existing_loggers=False) # if the stdout flag is set, we use the log level of the root logger # for logging to stdout, and keep all loggers defined in the conf file From 6d9e302d1b69f1176fcd48d3ebcca77f6c4a263e Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 14 Oct 2017 12:06:25 +0300 Subject: [PATCH 4/5] Remove unsupported Python < 2.5 --- src/collectors/bind/bind.py | 6 +----- src/collectors/endecadgraph/endecadgraph.py | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/collectors/bind/bind.py b/src/collectors/bind/bind.py index fa033ec35..9b8638a15 100644 --- a/src/collectors/bind/bind.py +++ b/src/collectors/bind/bind.py @@ -13,11 +13,7 @@ import diamond.collector import sys import urllib2 - -if sys.version_info >= (2, 5): - import xml.etree.cElementTree as ElementTree -else: - import cElementTree as ElementTree +import xml.etree.cElementTree as ElementTree class BindCollector(diamond.collector.Collector): diff --git a/src/collectors/endecadgraph/endecadgraph.py b/src/collectors/endecadgraph/endecadgraph.py index 3ee022cdc..efb0e371c 100644 --- a/src/collectors/endecadgraph/endecadgraph.py +++ b/src/collectors/endecadgraph/endecadgraph.py @@ -16,10 +16,7 @@ from StringIO import StringIO import re import sys -if sys.version_info >= (2, 5): - import xml.etree.cElementTree as ElementTree -else: - import cElementTree as ElementTree +import xml.etree.cElementTree as ElementTree class EndecaDgraphCollector(diamond.collector.Collector): From 1b950b909490b34398d557938722e9bd4b3f07af Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 14 Oct 2017 12:11:04 +0300 Subject: [PATCH 5/5] Remove unsupported Python < 2.6 --- src/collectors/postfix/postfix.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/collectors/postfix/postfix.py b/src/collectors/postfix/postfix.py index 16bbbea6d..6e7a831ed 100644 --- a/src/collectors/postfix/postfix.py +++ b/src/collectors/postfix/postfix.py @@ -25,11 +25,7 @@ from diamond.collector import str_to_bool -if sys.version_info < (2, 6): - from string import maketrans - DOTS_TO_UNDERS = maketrans('.', '_') -else: - DOTS_TO_UNDERS = {ord(u'.'): u'_'} +DOTS_TO_UNDERS = {ord(u'.'): u'_'} class PostfixCollector(diamond.collector.Collector):