Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit 32aa512

Browse files
authored
Merge pull request #75 from FlyrInc/feature/support-py3.7
feat: add support for Python 3.7
2 parents 3a9a936 + 88838bd commit 32aa512

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
sudo: false
21
language: python
2+
dist: xenial
33
python:
44
- "2.7"
55
- "3.4"
66
- "3.5"
77
- "3.6"
8+
- "3.7"
89
install: pip install tox-travis
910
script: tox

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
setup(
55
name="python-json-logger",
6-
version="0.1.10",
6+
version="0.1.11",
77
url="http://github.com/madzak/python-json-logger",
88
license="BSD",
99
description="A python library adding a json log formatter",
@@ -26,6 +26,7 @@
2626
'Programming Language :: Python :: 3.4',
2727
'Programming Language :: Python :: 3.5',
2828
'Programming Language :: Python :: 3.6',
29+
'Programming Language :: Python :: 3.7',
2930
'Topic :: System :: Logging',
3031
]
3132
)

src/pythonjsonlogger/jsonlogger.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111

1212
from inspect import istraceback
1313

14-
# Support order in python 2.7 and 3
15-
try:
16-
from collections import OrderedDict
17-
except ImportError:
18-
pass
14+
from collections import OrderedDict
1915

2016
# skip natural LogRecord attributes
2117
# http://docs.python.org/library/logging.html#logrecord-attributes

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py34, py35, py36
2+
envlist = py27, py34, py35, py36, py37
33

44
[testenv]
55
commands = python -m unittest discover

0 commit comments

Comments
 (0)