Remove unsupported Python 2.4 and 2.5 code

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 
 language: python
 python:
-#  - "2.5"
   - "2.6"
   - "2.7"
 

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):

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):

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):

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

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