diff options
| author | Jochen Breuer <jbreuer@suse.de> | 2019-09-04 15:11:09 +0200 |
|---|---|---|
| committer | Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com> | 2019-09-06 21:11:28 -0400 |
| commit | c96023e19a7783c927ccde572f9cc8c8ddd94926 (patch) | |
| tree | 0eaa5112ef7cd40a2a3720f43f70df07d5df7b19 | |
| parent | a804161cb9c1bbef95359ddf01b3bc072f691130 (diff) | |
| download | urlgrabber-c96023e19a7783c927ccde572f9cc8c8ddd94926.tar.gz | |
Fix for usage of _levelNames from logging module
With Python3 the internal dict has been renamed to _levelToName.
| -rw-r--r-- | scripts/urlgrabber | 5 | ||||
| -rw-r--r-- | urlgrabber/grabber.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/urlgrabber b/scripts/urlgrabber index 3c7cfbf..f745e13 100644 --- a/scripts/urlgrabber +++ b/scripts/urlgrabber @@ -307,7 +307,10 @@ class ugclient: try: dbinfo = dbspec.split(',') import logging - level = logging._levelNames.get(dbinfo[0], None) + if sys.version_info.major == 2: + level = logging._levelNames.get(dbinfo[0], None) + else: + level = logging._levelToName.get(dbinfo[0], None) if level is None: level = int(dbinfo[0]) if level < 1: raise ValueError() diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py index 9576fdb..e8d29d7 100644 --- a/urlgrabber/grabber.py +++ b/urlgrabber/grabber.py @@ -661,7 +661,10 @@ def _init_default_logger(logspec=None): logspec = os.environ['URLGRABBER_DEBUG'] dbinfo = logspec.split(',') import logging - level = logging._levelNames.get(dbinfo[0], None) + if sys.version_info.major == 2: + level = logging._levelNames.get(dbinfo[0], None) + else: + level = logging._levelToName.get(dbinfo[0], None) if level is None: level = int(dbinfo[0]) if level < 1: raise ValueError() |