Skip to content

Commit 07ca80a

Browse files
crsuarezyannmh
authored andcommitted
Python 2.6.x workaround for CentOS 6.8 (#182)
[fix] workaround for support python 2.6.x
1 parent 841bcdd commit 07ca80a

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

datadog/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
from datadog import api
1717
from datadog.dogstatsd import DogStatsd, statsd # noqa
1818
from datadog.threadstats import ThreadStats # noqa
19-
from datadog.util.compat import iteritems
19+
from datadog.util.compat import iteritems, NullHandler
2020
from datadog.util.config import get_version
2121
from datadog.util.hostname import get_hostname
2222

2323

2424
__version__ = get_version()
2525

2626
# Loggers
27-
logging.getLogger('datadog.api').addHandler(logging.NullHandler())
28-
logging.getLogger('datadog.dogstatsd').addHandler(logging.NullHandler())
29-
logging.getLogger('datadog.threadstats').addHandler(logging.NullHandler())
27+
logging.getLogger('datadog.api').addHandler(NullHandler())
28+
logging.getLogger('datadog.dogstatsd').addHandler(NullHandler())
29+
logging.getLogger('datadog.threadstats').addHandler(NullHandler())
3030

3131

3232
def initialize(api_key=None, app_key=None, host_name=None, api_host=None,

datadog/util/compat.py

+10
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,13 @@ def iscoroutinefunction(*args, **kwargs):
100100
import simplejson as json
101101
except ImportError:
102102
import json
103+
104+
#Python 2.6.x
105+
try:
106+
from logging import NullHandler
107+
except ImportError:
108+
from logging import Handler
109+
110+
class NullHandler(Handler):
111+
def emit(self, record):
112+
pass

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name="datadog",
19-
version="0.14.0",
19+
version="0.15.0",
2020
install_requires=install_reqs,
2121
tests_require=["tox", "nose", "mock", "six", "pillow"],
2222
packages=[

0 commit comments

Comments
 (0)