Update rolepermissions and social-auth-django-app (#3848)

* Fix url deprecation warning

* Lint

* Update rolepermissions and social-auth-app-django

* Switch from deprecated function

backends/pipeline_api.py

@@ -4,7 +4,7 @@
 import logging
 from urllib.parse import urljoin
 
-from rolepermissions.verifications import has_role
+from rolepermissions.checkers import has_role
 
 from backends.edxorg import EdxOrgOAuth2
 from micromasters.utils import now_in_utc

backends/views_test.py

@@ -3,7 +3,7 @@
 """
 from unittest.mock import patch
 from django.http import HttpResponse
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django_redis import get_redis_connection
 from rest_framework.test import APITestCase
 

certificates/views_test.py

@@ -4,7 +4,7 @@
 # pylint: disable=redefined-outer-name
 
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from micromasters.utils import is_subset_dict

cms/models.py

@@ -8,7 +8,7 @@
 from django.utils.text import slugify
 from modelcluster.fields import ParentalKey
 from raven.contrib.django.raven_compat.models import client as sentry
-from rolepermissions.verifications import has_role
+from rolepermissions.checkers import has_role
 from wagtail.wagtailadmin.edit_handlers import (FieldPanel, InlinePanel,
                                                 MultiFieldPanel)
 from wagtail.wagtailcore.fields import RichTextField
@@ -48,7 +48,7 @@ def get_program_page(program):
             try:
                 return program.programpage
             except ProgramPage.DoesNotExist:
-                return
+                return None
 
         program_pairs = [(program, get_program_page(program)) for program in programs]
         context["programs"] = program_pairs

courses/views_test.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase
 

dashboard/views_test.py

@@ -8,7 +8,7 @@
 )
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from requests.exceptions import HTTPError
 from rest_framework import status
 from rest_framework.test import APITestCase

discussions/utils.py

@@ -1,6 +1,6 @@
 """Discussions utils"""
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from open_discussions_api import utils
 
 from discussions import api

discussions/views_test.py

@@ -1,7 +1,7 @@
 """
 Tests for discussions views
 """
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import pytest
 from rest_framework import status as statuses
 from rest_framework.test import (

ecommerce/views_test.py

@@ -5,7 +5,7 @@
 from unittest.mock import patch
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models.signals import post_save
 from django.test import override_settings
 from factory.django import mute_signals

exams/views_test.py

@@ -7,7 +7,7 @@
 from rest_framework import status
 from rest_framework.test import APITestCase
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from exams.models import ExamProfile
 from micromasters.factories import UserFactory

financialaid/permissions.py

@@ -1,7 +1,7 @@
 """
 Permission classes for financial aid views
 """
-from rolepermissions.verifications import has_object_permission
+from rolepermissions.checkers import has_object_permission
 from rest_framework.permissions import BasePermission
 
 from roles.roles import Permissions

financialaid/views.py

@@ -20,7 +20,7 @@
 from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK
 from rest_framework.views import APIView
-from rolepermissions.verifications import (
+from rolepermissions.checkers import (
     has_object_permission,
     has_role,
 )

financialaid/views_pytest_test.py

@@ -6,7 +6,7 @@
 from types import SimpleNamespace
 from urllib.parse import urlencode
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import factory
 from rest_framework import status
 

financialaid/views_test.py

@@ -6,7 +6,7 @@
 
 from backends.edxorg import EdxOrgOAuth2
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.test import APIClient

mail/permissions.py

@@ -6,7 +6,7 @@
 
 from django.conf import settings
 
-from rolepermissions.verifications import has_permission
+from rolepermissions.checkers import has_permission
 from rest_framework.permissions import BasePermission
 
 from roles.roles import Permissions, Staff, Instructor

mail/views_test.py

@@ -5,7 +5,7 @@
 import ddt
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models.signals import post_save
 from django.test import override_settings
 from django.test.client import RequestFactory

micromasters/urls.py

@@ -19,7 +19,7 @@
 
 urlpatterns += [
     url(r'', include('backends.urls')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url('', include('courses.urls')),
     url('', include('dashboard.urls')),
     url('', include('ecommerce.urls')),

micromasters/urls_test.py

@@ -1,7 +1,7 @@
 """Tests for URLs"""
 
 from unittest import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class URLTests(TestCase):

profiles/views_test.py

@@ -8,7 +8,7 @@
 
 from dateutil.parser import parse
 import ddt
-from django.core.urlresolvers import resolve, reverse
+from django.urls import resolve, reverse
 from django.db.models.signals import post_save
 from factory.django import mute_signals
 from PIL import Image

requirements.in

@@ -7,7 +7,7 @@ dj-database-url==0.3.0
 dj-static==0.0.6
 django-cors-headers==2.1.0
 django-redis==4.7.0
-django-role-permissions==1.2
+django-role-permissions==2.2.0
 django-server-status==0.4.0
 django-storages-redux==1.3.2
 django-webpack-loader==0.4.1
@@ -33,7 +33,7 @@ python-dateutil
 raven
 redis==2.10.5
 requests
-social-auth-app-django==1.1.0
+social-auth-app-django==2.1.0
 robohash
 static3==0.5.1
 uwsgi

requirements.txt

@@ -23,7 +23,7 @@ django-cors-headers==2.1.0
 django-discover-runner==1.0  # via django-role-permissions
 django-modelcluster==3.1  # via wagtail
 django-redis==4.7.0
-django-role-permissions==1.2
+django-role-permissions==2.2.0
 django-server-status==0.4.0
 django-storages-redux==1.3.2
 django-taggit==0.22.1     # via wagtail
@@ -78,7 +78,7 @@ requests==2.11.1
 robohash==1.0
 simplegeneric==0.8.1      # via ipython
 six==1.10.0               # via bcrypt, cryptography, django-role-permissions, django-server-status, edx-api-client, edx-opaque-keys, elasticsearch-dsl, faker, html5lib, prompt-toolkit, pynacl, python-dateutil, social-auth-app-django, social-auth-core, stevedore, traitlets
-social-auth-app-django==1.1.0
+social-auth-app-django==2.1.0
 social-auth-core==1.4.0   # via social-auth-app-django
 static3==0.5.1
 stevedore==1.25.0         # via edx-opaque-keys

roles/api.py

@@ -1,7 +1,7 @@
 """
 API for roles
 """
-from rolepermissions.verifications import has_object_permission
+from rolepermissions.checkers import has_object_permission
 
 from roles.models import Role
 

roles/permissions.py

@@ -3,7 +3,7 @@
 """
 
 from rolepermissions.permissions import register_object_checker
-from rolepermissions.verifications import has_permission
+from rolepermissions.checkers import has_permission
 
 from roles.models import Role
 from roles.roles import Permissions

roles/signals.py

@@ -10,7 +10,7 @@
     post_delete,
 )
 from django.dispatch import receiver
-from rolepermissions.shortcuts import assign_role, remove_role
+from rolepermissions.roles import assign_role, remove_role
 
 from roles.models import Role
 
@@ -42,7 +42,7 @@ def save_remove_role_from_user(sender, instance, **kwargs):  # pylint: disable=u
         instance.role,
         instance.user.username,
     )
-    remove_role(instance.user)
+    remove_role(instance.user, old_instance.role)
 
 
 @receiver(post_save, sender=Role, dispatch_uid="save_assign_role_to_user")
@@ -75,4 +75,4 @@ def delete_remove_role_from_user(sender, instance, **kwargs):  # pylint: disable
         instance.role,
         instance.user.username,
     )
-    remove_role(instance.user)
+    remove_role(instance.user, instance.role)

roles/signals_test.py

@@ -3,7 +3,7 @@
 """
 from django.db.models.signals import post_save
 from factory.django import mute_signals
-from rolepermissions.verifications import (
+from rolepermissions.checkers import (
     has_role,
     has_permission,
     has_object_permission,

search/permissions.py

@@ -2,7 +2,7 @@
 Permission classes for search views
 """
 
-from rolepermissions.verifications import has_permission
+from rolepermissions.checkers import has_permission
 from rest_framework.permissions import BasePermission
 
 from roles.roles import Permissions

search/views_test.py

@@ -3,7 +3,7 @@
 """
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models.signals import post_save
 from django.test import override_settings
 from factory.django import mute_signals

ui/views.py

@@ -6,14 +6,14 @@
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import Http404, redirect, render
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import View, TemplateView
 from raven.contrib.django.raven_compat.models import client as sentry
-from rolepermissions.shortcuts import available_perm_status
-from rolepermissions.verifications import has_role
+from rolepermissions.permissions import available_perm_status
+from rolepermissions.checkers import has_role
 
 from micromasters.utils import webpack_dev_server_host
 from micromasters.serializers import serialize_maybe_user

ui/views_test.py

@@ -7,13 +7,13 @@
 
 import ddt
 from django.db.models.signals import post_save
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import override_settings
 from factory import Iterator
 from factory.django import mute_signals
 from factory.fuzzy import FuzzyText
 from rest_framework import status
-from rolepermissions.shortcuts import available_perm_status
+from rolepermissions.permissions import available_perm_status
 from wagtail.wagtailimages.models import Image
 from wagtail.wagtailimages.tests.utils import get_test_image_file