Merge pull request #15766 from edx/bmedx/ratelimit_upgrade_PLAT-1633

Upgrade django-ratelimit-backend to Django 1.11

cms/djangoapps/course_creators/admin.py

@@ -6,9 +6,9 @@ import logging
 from smtplib import SMTPException
 
 from django.conf import settings
+from django.contrib import admin
 from django.core.mail import send_mail
 from django.dispatch import receiver
-from ratelimitbackend import admin
 
 from course_creators.models import CourseCreator, send_admin_notification, send_user_notification, update_creator_state
 from course_creators.views import update_course_creator_group

cms/urls.py

 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
-# There is a course creators admin table.
+from django.contrib.admin import autodiscover as django_autodiscover
 from ratelimitbackend import admin
 
 from cms.djangoapps.contentstore.views.organization import OrganizationListView
 
-admin.autodiscover()
+
+django_autodiscover()
 
 # Pattern to match a course key or a library key
 COURSELIKE_KEY_PATTERN = r'(?P<course_key_string>({}|{}))'.format(
     r'[^/]+/[^/]+/[^/]+', r'[^/:]+:[^/+]+\+[^/+]+(\+[^/]+)?'
 )
+
 # Pattern to match a library key only
 LIBRARY_KEY_PATTERN = r'(?P<library_key_string>library-v1:[^/+]+\+[^/+]+)'
 

common/djangoapps/student/admin.py

 """ Django admin pages for student app """
 from config_models.admin import ConfigurationModelAdmin
 from django import forms
+from django.contrib import admin
 from django.contrib.admin.sites import NotRegistered
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.utils.translation import ugettext_lazy as _
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
-from ratelimitbackend import admin
 
 from student.models import (
     CourseAccessRole,

common/djangoapps/track/admin.py

@@ -2,7 +2,7 @@
 django admin pages for courseware model
 '''
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from track.models import TrackingLog
 

common/djangoapps/util/admin.py

 """Admin interface for the util app. """
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from util.models import RateLimitConfiguration
 

lms/djangoapps/courseware/admin.py

+from django.contrib import admin
+
 from config_models.admin import ConfigurationModelAdmin, KeyedConfigurationModelAdmin
-from ratelimitbackend import admin
 
 from courseware import models
 

lms/djangoapps/shoppingcart/admin.py

 """Django admin interface for the shopping cart models. """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from shoppingcart.models import (
     Coupon,

lms/djangoapps/verify_student/admin.py

@@ -4,7 +4,7 @@ Admin site configurations for verify_student.
 """
 
 from config_models.admin import ConfigurationModelAdmin
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
 

lms/urls.py

@@ -6,6 +6,7 @@ from config_models.views import ConfigurationModelCurrentAPIView
 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
+from django.contrib.admin import autodiscover as django_autodiscover
 from django.views.generic.base import RedirectView
 from ratelimitbackend import admin
 
@@ -20,9 +21,8 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 from openedx.features.enterprise_support.api import enterprise_enabled
 
 
-# Uncomment the next two lines to enable the admin:
 if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
-    admin.autodiscover()
+    django_autodiscover()
 
 # Use urlpatterns formatted as within the Django docs with first parameter "stuck" to the open parenthesis
 urlpatterns = (

openedx/core/djangoapps/content/course_structures/admin.py

 """
 Django Admin model registry for Course Structures sub-application
 """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from .models import CourseStructure
 

openedx/core/djangoapps/credit/admin.py

 """
 Django admin page for credit eligibility
 """
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from openedx.core.djangoapps.credit.models import (
     CreditConfig,

openedx/core/djangoapps/external_auth/admin.py

@@ -2,7 +2,7 @@
 django admin pages for courseware model
 '''
 
-from ratelimitbackend import admin
+from django.contrib import admin
 
 from openedx.core.djangoapps.external_auth.models import ExternalAuthMap
 

requirements/edx/base.txt

@@ -109,7 +109,7 @@ stevedore==1.10.0
 sure==1.2.3
 sympy==0.7.1
 xmltodict==0.4.1
-django-ratelimit-backend==1.0
+django-ratelimit-backend==1.1.1
 unicodecsv==0.14.1
 django-require==1.0.11
 django-webpack-loader==0.4.1