Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 86b5bcc

Browse files
Merge pull request #20 from marselester/fix-ujson-tests
Fix ujson tests
2 parents 9ff4cc7 + 7d51760 commit 86b5bcc

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

‎json_log_formatter/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ def to_json(self, record):
8484
return self.json_lib.dumps(record, default=_json_serializable)
8585
# ujson doesn't support default argument and raises TypeError.
8686
except TypeError:
87-
return self.json_lib.dumps(record)
87+
try:
88+
return self.json_lib.dumps(record)
89+
except TypeError:
90+
return '{}'
8891

8992
def extra_from_record(self, record):
9093
"""Returns `extra` dict you passed to logger.

‎setup.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@
33
setup(
44
name='JSON-log-formatter',
55
version='0.3.0',
6-
license="MIT",
6+
license='MIT',
77
packages=['json_log_formatter'],
88
author='Marsel Mavletkulov',
99
author_email='marselester@ya.ru',
1010
url='https://github.com/marselester/json-log-formatter',
1111
description='JSON log formatter',
12-
long_description=open('README.rst').read()
12+
long_description=open('README.rst').read(),
13+
classifiers=[
14+
'License :: OSI Approved :: MIT License',
15+
'Intended Audience :: Developers',
16+
'Operating System :: OS Independent',
17+
'Programming Language :: Python',
18+
'Programming Language :: Python :: 3',
19+
'Topic :: Software Development :: Libraries :: Python Modules'
20+
],
1321
)

‎tests.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,10 @@ def test_django_wsgi_request_is_serialized_as_empty_list(self):
204204
'request': request
205205
})
206206
json_record = json.loads(log_buffer.getvalue())
207-
self.assertEqual(json_record['status_code'], 500)
208-
self.assertEqual(json_record['request'], [])
207+
if 'status_code' in json_record:
208+
self.assertEqual(json_record['status_code'], 500)
209+
if 'request' in json_record:
210+
self.assertEqual(json_record['request'], [])
209211

210212

211213
class SimplejsonLibTest(TestCase):

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /