diff options
| author | Magnus Hagander | 2015-12-12 16:43:23 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2015-12-12 16:43:23 +0000 |
| commit | 2a50d7cf409e209c47da5025783f809f6e4d987f (patch) | |
| tree | aa41a9bb6ced894bfac0785cba2f97a7240e75c8 /postgresqleu/auth.py | |
| parent | 0da604e5bd13f8b9d45512b428ca72ff50abe5f2 (diff) | |
Replace simpljson imports with json
This has been in standard python since 2.6, and we don't really care
about supporting anything older than that (even our old and soon to
be upgraded environments use 2.7)
Diffstat (limited to 'postgresqleu/auth.py')
| -rw-r--r-- | postgresqleu/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postgresqleu/auth.py b/postgresqleu/auth.py index da1194b2..1e33663f 100644 --- a/postgresqleu/auth.py +++ b/postgresqleu/auth.py @@ -26,7 +26,7 @@ from django.contrib.auth import logout as django_logout from django.conf import settings import base64 -import simplejson +import json import socket import urlparse import urllib @@ -200,7 +200,7 @@ def user_search(searchterm=None, userid=None): AES.MODE_CBC, base64.b64decode(ivs, "-_")) s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(' ') - j = simplejson.loads(s) + j = json.loads(s) return j |