Improve Python 2.6 support

josegonzalez · josegonzalez · commit 525b540899e6 · 2012-12-18T04:20:10.000-05:00
diff --git a/beaver/beaver_config.py b/beaver/beaver_config.py
@@ -1,9 +1,13 @@
 import ConfigParser
-import collections
 import os
 import socket
 import warnings
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
 
 class BeaverConfig():
 
@@ -98,7 +102,7 @@ def _parse_beaver_config(self, args):
             else:
                 config['hostname'] = socket.gethostname()
 
-        config = collections.OrderedDict(sorted(config.items()))
+        config = OrderedDict(sorted(config.items()))
         return config
 
     def get(self, key, default=None):
@@ -173,4 +177,3 @@ def check_for_deprecated_usage(self):
         if len(deprecated_env_var_usage) > 0:
             warnings.simplefilter('default')
             warnings.warn('ENV Variable support will be removed by version 20. Stop using: {0}'.format(", ".join(deprecated_env_var_usage)), DeprecationWarning)
-
diff --git a/beaver/utils.py b/beaver/utils.py
@@ -23,11 +23,15 @@ def setup_custom_logger(name, debug=False, formatter=None):
     if debug:
         logger.setLevel(logging.DEBUG)
         logger.info('Debug level is on')
-        logging.captureWarnings(True)
+        if hasattr(logging, 'captureWarnings'):
+            # New in Python 2.7
+            logging.captureWarnings(True)
     else:
         logger.setLevel(logging.INFO)
         logger.info('Info level is on')
-        logging.captureWarnings(False)
+        if hasattr(logging, 'captureWarnings'):
+            # New in Python 2.7
+            logging.captureWarnings(False)
 
     return logger
 
diff --git a/requirements/base26.txt b/requirements/base26.txt
@@ -0,0 +1,5 @@
+argparse>=1.2.0
+pika>=0.9.5
+redis==2.4.11
+ujson==1.9
+ordereddict
diff --git a/setup.py b/setup.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import sys
 
 from beaver import __version__
 
@@ -7,6 +8,12 @@
 except ImportError:
     from distutils.core import setup
 
+
+if sys.version_info[:2] <= (2, 6):
+    requirements = open('requirements/base26.txt').readlines()
+else:
+    requirements = open('requirements/base.txt').readlines()
+
 setup(
     name='Beaver',
     version=__version__,
@@ -29,5 +36,5 @@
                      open('CHANGES.rst').read(),
     tests_require=['nose'],
     test_suite='nose.collector',
-    install_requires=open('requirements/base.txt').readlines(),
+    install_requires=requirements,
 )
