Use simplejson instead of json

This commit is contained in:
Sharoon Thomas 2013-09-25 16:38:38 +05:30 committed by Priyanka Rani
parent 547ee721b9
commit 51a39e6dbc
4 changed files with 4 additions and 2 deletions

View File

@ -65,6 +65,7 @@ class NereidUser:
}
result['email'] = self.email
result['employee'] = self.employee and self.employee.id or None
result['permissions'] = [p.value for p in self.permissions]
return result
@classmethod

View File

@ -10,7 +10,6 @@
import uuid
import re
import tempfile
import json
import warnings
import time
import dateutil.parser
@ -22,6 +21,7 @@ from itertools import chain, cycle
from mimetypes import guess_type
from email.utils import parseaddr
import simplejson as json
from babel.dates import parse_date
from nereid import (
request, abort, render_template, login_required, url_for, redirect,

View File

@ -3,5 +3,5 @@ exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,build,dist,upload.py,doc,scripts,sele
ignore = E126
# This needs to be brought down to 5
max-complexity=16
max-complexity=20
max-line-length=80

View File

@ -30,6 +30,7 @@ minor_version = int(minor_version)
requires = [
'raven',
'blinker',
'simplejson',
]
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):