diff --git a/seahub/api2/views.py b/seahub/api2/views.py index 48afa10e41..ef8b462df8 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -2,7 +2,7 @@ import logging import os import stat -import simplejson as json +import json import datetime from urllib2 import unquote, quote diff --git a/seahub/auth/decorators.py b/seahub/auth/decorators.py index 57def06efc..e471091a86 100644 --- a/seahub/auth/decorators.py +++ b/seahub/auth/decorators.py @@ -7,7 +7,7 @@ from seahub.auth import REDIRECT_FIELD_NAME from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.utils.decorators import available_attrs from django.utils.http import urlquote -import simplejson as json +import json from django.utils.translation import ugettext as _ def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME): diff --git a/seahub/base/models.py b/seahub/base/models.py index f5c82474d2..4b56fb00b0 100644 --- a/seahub/base/models.py +++ b/seahub/base/models.py @@ -1,6 +1,6 @@ import datetime import logging -import simplejson as json +import json from django.db import models, IntegrityError from django.utils import timezone diff --git a/seahub/contacts/views.py b/seahub/contacts/views.py index 6912d39fb8..caa374cfd7 100644 --- a/seahub/contacts/views.py +++ b/seahub/contacts/views.py @@ -1,6 +1,6 @@ # encoding: utf-8 import logging -import simplejson as json +import json from django.http import HttpResponse, HttpResponseBadRequest, \ HttpResponseRedirect from django.shortcuts import render_to_response, Http404 diff --git a/seahub/group/views.py b/seahub/group/views.py index f4c0e3f6a6..69371ea805 100644 --- a/seahub/group/views.py +++ b/seahub/group/views.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import logging import os -import simplejson as json +import json import urllib2 from django.conf import settings diff --git a/seahub/message/views.py b/seahub/message/views.py index 1ba6213109..fcb003caf0 100755 --- a/seahub/message/views.py +++ b/seahub/message/views.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os import datetime -import simplejson as json +import json from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import render_to_response from django.template.loader import render_to_string diff --git a/seahub/notifications/management/commands/send_notices.py b/seahub/notifications/management/commands/send_notices.py index a716b0c12a..e30fcbf99b 100644 --- a/seahub/notifications/management/commands/send_notices.py +++ b/seahub/notifications/management/commands/send_notices.py @@ -1,7 +1,7 @@ # encoding: utf-8 import datetime import logging -import simplejson as json +import json import os import re diff --git a/seahub/notifications/models.py b/seahub/notifications/models.py index d5fd348439..181044b833 100644 --- a/seahub/notifications/models.py +++ b/seahub/notifications/models.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import datetime import os -import simplejson as json +import json from django.db import models from django.db.models.signals import post_save diff --git a/seahub/notifications/views.py b/seahub/notifications/views.py index 2eddd4bcb1..664b2dfe8b 100644 --- a/seahub/notifications/views.py +++ b/seahub/notifications/views.py @@ -1,4 +1,4 @@ -import simplejson as json +import json from django.conf import settings from django.core.urlresolvers import reverse from django.contrib import messages diff --git a/seahub/profile/views.py b/seahub/profile/views.py index 06d33ff906..3c4fb5959a 100644 --- a/seahub/profile/views.py +++ b/seahub/profile/views.py @@ -1,6 +1,6 @@ # encoding: utf-8 from django.conf import settings -import simplejson as json +import json from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import render_to_response diff --git a/seahub/share/views.py b/seahub/share/views.py index 42d113fd6c..60f1e461a2 100644 --- a/seahub/share/views.py +++ b/seahub/share/views.py @@ -1,7 +1,7 @@ # encoding: utf-8 import os import logging -import simplejson as json +import json from dateutil.relativedelta import relativedelta from django.core.urlresolvers import reverse diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 9ca2e85e8a..1cc5ffcc71 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -2,7 +2,7 @@ import hashlib import os import stat -import simplejson as json +import json import mimetypes import urllib2 import logging diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 48c97070e2..c9919e5df6 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -2,7 +2,7 @@ import os import stat import logging -import simplejson as json +import json from django.core.urlresolvers import reverse from django.http import HttpResponse, Http404, HttpResponseBadRequest diff --git a/seahub/views/file.py b/seahub/views/file.py index ffd6a18247..4963627ff7 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -6,7 +6,7 @@ view_snapshot_file, view_shared_file, file_edit, etc. import os import hashlib -import simplejson as json +import json import stat import urllib2 import chardet diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index abfb2d827a..3ca51eee72 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -3,7 +3,7 @@ import os from types import FunctionType import logging -import simplejson as json +import json import re import datetime import csv, chardet, StringIO diff --git a/seahub/views/wiki.py b/seahub/views/wiki.py index b27b5160c0..1c5f4806a3 100644 --- a/seahub/views/wiki.py +++ b/seahub/views/wiki.py @@ -6,7 +6,7 @@ view_trash_file, view_snapshot_file import os import hashlib -import simplejson as json +import json import stat import tempfile import urllib