Merge pull request #370 from MITx/feature/bridger/django1.4

Feature/bridger/django1.4

askbot @ e56ae380

-Subproject commit 1c3381046c78e055439ba1c78e0df48410fcc13e
+Subproject commit e56ae380846f7c6cdaeacfc58880fab103540491

cms/envs/common.py

@@ -83,7 +83,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'django.core.context_processors.static',
     'django.contrib.messages.context_processors.messages',
-    'django.core.context_processors.auth',  # this is required for admin
+    'django.contrib.auth.context_processors.auth',  # this is required for admin
     'django.core.context_processors.csrf',  # necessary for csrf protection
 )
 

cms/urls.py

 from django.conf import settings
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 
 import django.contrib.auth.views
 

common/djangoapps/util/json_request.py

@@ -9,7 +9,7 @@ def expect_json(view_function):
         if request.META['CONTENT_TYPE'] == "application/json":
             cloned_request = copy.copy(request)
             cloned_request.POST = cloned_request.POST.copy()
-            cloned_request.POST.update(json.loads(request.raw_post_data))
+            cloned_request.POST.update(json.loads(request.body))
             return view_function(cloned_request, *args, **kwargs)
         else:
             return view_function(request, *args, **kwargs)

lms/djangoapps/heartbeat/urls.py

-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     url(r'^$', 'heartbeat.views.heartbeat', name='heartbeat'),

lms/djangoapps/simplewiki/urls.py

-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 namespace_regex = r"[a-zA-Z\d._-]+"
 article_slug = r'/(?P<article_path>' + namespace_regex + r'/[a-zA-Z\d_-]*)'

lms/envs/common.py

@@ -109,7 +109,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
     #'django.core.context_processors.i18n',
     'askbot.user_messages.context_processors.user_messages',#must be before auth
-    'django.core.context_processors.auth', #this is required for admin
+    'django.contrib.auth.context_processors.auth', #this is required for admin
     'django.core.context_processors.csrf', #necessary for csrf protection
 )
 

lms/urls.py

 from django.conf import settings
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.conf.urls.static import static
 

requirements.txt

-django<1.4
+django>=1.4,<1.5
 pip
 numpy
 scipy