Skip to content

Commit 85c28f9

Browse files
authored
Merge pull request Raekkeri#8 from ride90/django-json-encoder
JSON encoder
2 parents 1f699df + 9e69899 commit 85c28f9

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
*.swp
33
*.DS_Store
44
.env
5+
.python-version
56
*.map
67
*.db
78
tags
89
.tox
910
*.egg-info/
1011
dist/
1112
build/
13+
.idea

requestlogs/storages.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import logging
33

44
from rest_framework import serializers
5+
from rest_framework.utils.encoders import JSONEncoder
56

67
from .base import SETTINGS
78

@@ -11,7 +12,7 @@
1112

1213
class JsonDumpField(serializers.Field):
1314
def to_representation(self, value):
14-
return json.dumps(value)
15+
return json.dumps(value, cls=JSONEncoder)
1516

1617

1718
class BaseRequestSerializer(serializers.Serializer):

setup.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
with open('README.md', 'r') as fh:
44
long_description = fh.read()
55

6+
requirements = (
7+
'Django>=1.11,<4.0',
8+
'djangorestframework>=3.0,<4.0',
9+
'setuptools',
10+
)
11+
12+
dev_requirements = (
13+
'pytest',
14+
)
15+
616
setup(
717
name='django-requestlogs',
818
zip_safe=False,
@@ -17,9 +27,8 @@
1727
url='https://github.com/Raekkeri/django-requestlogs',
1828
download_url='https://github.com/raekkeri/django-requestlogs/tarball/0.1',
1929
packages=find_packages(exclude=['tests']),
20-
install_requires=[
21-
'Django>=1.11,<4.0',
22-
'djangorestframework>=3.0,<4.0',
23-
'setuptools',
24-
],
30+
install_requires=requirements,
31+
extras_require={
32+
'dev': dev_requirements
33+
},
2534
)

0 commit comments

Comments
 (0)