Merge pull request #16840 from edx/bmedx/django111_conditional_birdcage

Make all uses of birdcage conditional, should fix 1.11 errors

openedx/core/djangoapps/cors_csrf/middleware.py

@@ -44,12 +44,20 @@ CSRF cookie.
 
 import logging
 
+import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, MiddlewareNotUsed
-from birdcage.v1_11.csrf import CsrfViewMiddleware
 
 from .helpers import is_cross_domain_request_allowed, skip_cross_domain_referer_check
 
+# TODO: Remove Django 1.11 upgrade shim
+# SHIM: Remove birdcage references post-1.11 upgrade as it is only in place to help during that deployment
+if django.VERSION < (1, 9):
+    from birdcage.v1_11.csrf import CsrfViewMiddleware
+else:
+    from django.middleware.csrf import CsrfViewMiddleware
+
+
 log = logging.getLogger(__name__)
 
 

openedx/core/djangoapps/cors_csrf/tests/test_middleware.py

@@ -5,11 +5,18 @@ Tests for the CORS CSRF middleware
 from mock import patch, Mock
 import ddt
 
+import django
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.core.exceptions import MiddlewareNotUsed, ImproperlyConfigured
 from django.http import HttpResponse
-from birdcage.v1_11.csrf import CsrfViewMiddleware
+
+# TODO: Remove Django 1.11 upgrade shim
+# SHIM: Remove birdcage references post-1.11 upgrade as it is only in place to help during that deployment
+if django.VERSION < (1, 9):
+    from birdcage.v1_11.csrf import CsrfViewMiddleware
+else:
+    from django.middleware.csrf import CsrfViewMiddleware
 
 from ..middleware import CorsCSRFMiddleware, CsrfCrossDomainCookieMiddleware