summaryrefslogtreecommitdiff
path: root/oauthlib/__init__.py
diff options
context:
space:
mode:
authorJonathan Huot <jonathan.huot@thomsonreuters.com>2018-08-02 10:29:22 +0200
committerJonathan Huot <jonathan.huot@thomsonreuters.com>2018-08-02 10:29:22 +0200
commit1d07167210297cd9691e5397f09477fea5df5279 (patch)
treef7e9b97dc966161b11c21945b58922f50441f187 /oauthlib/__init__.py
parentc9ead44e9c3bef100a6434ffbe56a002d54f0475 (diff)
parentfbacd77b602e4c60f8da2413c150fa7f20b2f83c (diff)
downloadoauthlib-431-customerrors.tar.gz
Merge branch 'master' into 431-customerrors431-customerrors
Diffstat (limited to 'oauthlib/__init__.py')
-rw-r--r--oauthlib/__init__.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/oauthlib/__init__.py b/oauthlib/__init__.py
index 3393efe..b7586d2 100644
--- a/oauthlib/__init__.py
+++ b/oauthlib/__init__.py
@@ -8,18 +8,10 @@
:copyright: (c) 2011 by Idan Gazit.
:license: BSD, see LICENSE for details.
"""
+import logging
+from logging import NullHandler
__author__ = 'The OAuthlib Community'
__version__ = '2.1.0'
-
-import logging
-try: # Python 2.7+
- from logging import NullHandler
-except ImportError:
- class NullHandler(logging.Handler):
-
- def emit(self, record):
- pass
-
logging.getLogger('oauthlib').addHandler(NullHandler())