Updated to support Django 1.7

Author: Neil Newman

.gitignore

@@ -8,6 +8,7 @@ db
 /env
 /venv
 /django-jquery-file-upload
+/static
 *.log
 *.pot
 *.pyc

fileupload/response.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 from django.http import HttpResponse
-from django.utils import simplejson
+import json
 
 MIMEANY = '*/*'
 MIMEJSON = 'application/json'
@@ -34,5 +34,5 @@ def a_iew(request):
     """
     def __init__(self, obj='', json_opts=None, mimetype=MIMEJSON, *args, **kwargs):
         json_opts = json_opts if isinstance(json_opts, dict) else {}
-        content = simplejson.dumps(obj, **json_opts)
+        content = json.dumps(obj, **json_opts)
         super(JSONResponse, self).__init__(content, mimetype, *args, **kwargs)

manage.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-import imp
-try:
-    imp.find_module('settings') # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
-    sys.exit(1)
-
-import settings
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

requirements.txt

@@ -1,2 +1,2 @@
-django<1.6
+django<1.8
 pillow

settings.py

@@ -102,7 +102,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'django-jquery-file-upload.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".