mirror of
https://github.com/postgres/pgweb.git
synced 2025-07-23 00:47:10 +00:00
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)
This commit is contained in:
@ -15,7 +15,7 @@ import urllib
|
||||
from Crypto.Cipher import AES
|
||||
from Crypto import Random
|
||||
import time
|
||||
import simplejson as json
|
||||
import json
|
||||
|
||||
from pgweb.util.decorators import ssl_required
|
||||
from pgweb.util.contexts import NavContext
|
||||
|
@ -3,7 +3,7 @@ from django.http import HttpResponse
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.conf import settings
|
||||
|
||||
import simplejson as json
|
||||
import json
|
||||
|
||||
from pgweb.util.contexts import NavContext
|
||||
from pgweb.mailqueue.util import send_simple_mail
|
||||
|
@ -9,7 +9,7 @@ from pgweb.util.decorators import cache
|
||||
import httplib
|
||||
import urllib
|
||||
import psycopg2
|
||||
import simplejson as json
|
||||
import json
|
||||
import socket
|
||||
|
||||
from lists.models import MailingList
|
||||
|
@ -2,4 +2,3 @@ Django==1.4.5
|
||||
django-markdown==0.2.1
|
||||
psycopg2==2.5
|
||||
pycrypto==2.6
|
||||
simplejson==3.3.0
|
||||
|
@ -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,6 +200,6 @@ 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
|
||||
|
Reference in New Issue
Block a user