add refactor Django code for backward compatible syntax changes (#9300)

## Purpose

Get backwards compatible code out of the way before we flip over to Django 2

## Changes
- Make Many-to-manys use direct assignment
- add  `on_delete` kwarg to  foreign key fields
- Get urls helpers from  `django.urls` instead of `django.core.urlresolvers` which is depreciated
- Change url namespaces for new Django 2 url format.

## QA Notes

- No data migration
- Low risk
- No permissions code touched
- No user facing changes

## Documentation

Tech task, no new docs.

## Side Effects

None that I know of.

## Ticket

https://openscience.atlassian.net/browse/ENG-1392

addons/base/tests/models.py

@@ -264,7 +264,7 @@ def test_folder_defaults_to_none(self):
         assert_is_none(node_settings.folder_id)
 
     def test_has_auth(self):
-        self.user.external_accounts = []
+        self.user.external_accounts.clear()
         self.user_settings.reload()
         node = ProjectFactory()
         settings = self.NodeSettingsClass(user_settings=self.user_settings, owner=node)

addons/base/tests/serializers.py

@@ -99,7 +99,7 @@ def test_user_is_owner_no_node_settings(self):
         assert_false(ser.user_is_owner)
 
     def test_user_is_owner_node_not_authorized_user_has_no_accounts(self):
-        self.user.external_accounts = []
+        self.user.external_accounts.clear()
         assert_false(self.user_settings.external_accounts.count())
         assert_false(self.ser.user_is_owner)
 
@@ -111,7 +111,7 @@ def test_user_is_owner_node_authorized_user_is_not_owner(self):
         self.node_settings.external_account = self.ExternalAccountFactory()
         with mock.patch('addons.base.models.BaseOAuthUserSettings.verify_oauth_access',
                 return_value=True):
-            self.user.external_accounts = []
+            self.user.external_accounts.clear()
             assert_false(self.ser.user_is_owner)
 
     def test_user_is_owner_node_authorized_user_is_owner(self):

addons/gitlab/models.py

@@ -76,7 +76,7 @@ class NodeSettings(BaseOAuthNodeSettings, BaseStorageAddon):
     repo_id = models.TextField(blank=True, null=True)
     hook_id = models.TextField(blank=True, null=True)
     hook_secret = models.TextField(blank=True, null=True)
-    user_settings = models.ForeignKey(UserSettings, null=True, blank=True)
+    user_settings = models.ForeignKey(UserSettings, null=True, blank=True, on_delete=models.CASCADE)
 
     @property
     def folder_id(self):

addons/onedrive/models.py

@@ -98,7 +98,7 @@ class NodeSettings(BaseOAuthNodeSettings, BaseStorageAddon):
 
     folder_id = models.TextField(null=True, blank=True)
     folder_path = models.TextField(null=True, blank=True)
-    user_settings = models.ForeignKey(UserSettings, null=True, blank=True)
+    user_settings = models.ForeignKey(UserSettings, null=True, blank=True, on_delete=models.CASCADE)
 
     _api = None
 

admin/asset_files/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.db.models import Case, CharField, Value, When
 from django.forms.models import model_to_dict
 from django.views.generic import ListView, DetailView, View, CreateView, DeleteView, UpdateView

admin/banners/views.py

@@ -5,7 +5,7 @@
 
 from django.shortcuts import redirect
 from django.forms.models import model_to_dict
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.views.generic import ListView, DetailView, View, CreateView, UpdateView, DeleteView
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib import messages

admin/base/utils.py

@@ -4,7 +4,7 @@
 from osf.models import Subject, NodeLicense
 
 from django.core.exceptions import ValidationError, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.validators import RegexValidator, _lazy_re_compile
 from django.utils.http import urlencode
 from django.utils.translation import ugettext_lazy as _

admin/collection_providers/views.py

@@ -3,7 +3,7 @@
 from django.http import HttpResponse
 from django.core import serializers
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.shortcuts import redirect
 from django.views.generic import View, CreateView, ListView, DetailView, UpdateView, DeleteView, TemplateView
 from django.contrib import messages
@@ -317,7 +317,7 @@ def create_or_update_provider(self, provider_data):
             provider.primary_collection.program_area_choices = primary_collection['fields']['program_area_choices']
             provider.primary_collection.save()
         if licenses:
-            provider.licenses_acceptable = licenses
+            provider.licenses_acceptable.add(*licenses)
         if default_license:
             provider.default_license = NodeLicense.objects.get(license_id=default_license)
         return provider

admin/common_auth/admin.py

@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.contrib.admin.models import DELETION
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.html import escape
 
 from osf.models import AdminLogEntry

admin/common_auth/urls.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from django.conf.urls import url
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.contrib.auth.views import password_change, password_change_done
 
 from admin.common_auth import views

admin/common_auth/views.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.http import Http404
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator

admin/institutions/views.py

@@ -6,7 +6,7 @@
 from django.core import serializers
 from django.shortcuts import redirect
 from django.forms.models import model_to_dict
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.urls import reverse_lazy, reverse
 from django.http import HttpResponse, JsonResponse
 from django.views.generic import ListView, DetailView, View, CreateView, UpdateView, DeleteView, TemplateView
 from django.views.generic.edit import FormView

admin/meetings/views.py

@@ -3,7 +3,7 @@
 
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.views.generic import ListView, FormView
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404
 
 from framework.auth.core import get_user
@@ -113,7 +113,7 @@ def form_valid(self, form):
             **data
         )
         new_conf.save()
-        new_conf.admins = admin_users
+        new_conf.admins.add(*admin_users)
         new_conf.field_names.update(custom_fields)
         new_conf.save()
         return super(MeetingCreateFormView, self).form_valid(form)

admin/nodes/templatetags/node_extras.py

@@ -1,5 +1,5 @@
 from django import template
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from osf.models import Node, OSFUser
 

admin/osf_groups/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.views.generic import FormView, ListView
 
 from osf.models import OSFGroup

admin/preprint_providers/views.py

@@ -6,7 +6,7 @@
 from django.http import Http404
 from django.core import serializers
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.urls import reverse_lazy, reverse
 from django.http import HttpResponse, JsonResponse
 from django.views.generic import ListView, DetailView, View, CreateView, DeleteView, TemplateView, UpdateView
 from django.views.generic.edit import FormView
@@ -331,7 +331,8 @@ def create_or_update_provider(self, provider_data):
         provider.save()
 
         if licenses:
-            provider.licenses_acceptable = licenses
+            provider.licenses_acceptable.clear()
+            provider.licenses_acceptable.add(*licenses)
         if default_license:
             provider.default_license = NodeLicense.objects.get(license_id=default_license)
         # Only adds the JSON taxonomy if there is no existing taxonomy data

admin/preprints/views.py

@@ -2,7 +2,7 @@
 
 from django.views.generic import UpdateView, DeleteView, ListView
 from django.utils import timezone
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.shortcuts import redirect
 from django.views.defaults import page_not_found

admin/registration_providers/views.py

@@ -4,7 +4,7 @@
 from django.core import serializers
 from django.core.exceptions import ValidationError
 from django.core.management import call_command
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.shortcuts import redirect
 from django.views.generic import View, CreateView, ListView, DetailView, UpdateView, DeleteView, TemplateView
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -294,7 +294,7 @@ def create_or_update_provider(self, provider_data):
             provider.save()
 
         if licenses:
-            provider.licenses_acceptable = licenses
+            provider.licenses_acceptable.add(*licenses)
         if default_license:
             provider.default_license = NodeLicense.objects.get(license_id=default_license)
 

admin/subjects/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.views.generic import ListView, UpdateView
 
 from admin.subjects.forms import SubjectForm

admin/users/templatetags/user_extras.py

@@ -1,5 +1,5 @@
 from django import template
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 register = template.Library()
 

admin/users/views.py

@@ -9,7 +9,7 @@
 from django.views.generic import FormView, DeleteView, ListView, TemplateView
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django.core.mail import send_mail
 from django.http import Http404, HttpResponse

admin_tests/meetings/test_views.py

@@ -2,7 +2,7 @@
 
 from django.test import RequestFactory
 from django.http import Http404
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.models import Permission
 from django.core.exceptions import PermissionDenied
 

admin_tests/nodes/test_views.py

@@ -24,7 +24,7 @@
 from nose import tools as nt
 from django.utils import timezone
 from django.test import RequestFactory
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django.contrib.auth.models import Permission
 from framework.auth.core import Auth

admin_tests/preprint_providers/test_views.py

@@ -177,7 +177,7 @@ def setUp(self):
         self.import_view = views.ImportPreprintProvider()
         self.import_view = setup_user_view(self.import_view, self.import_request, user=self.user)
 
-        self.preprint_provider.licenses_acceptable = [NodeLicense.objects.get(license_id='NONE')]
+        self.preprint_provider.licenses_acceptable.add(*[NodeLicense.objects.get(license_id='NONE')])
         self.subject = SubjectFactory(provider=self.preprint_provider)
 
     def test_post(self):

admin_tests/preprints/test_views.py

@@ -2,7 +2,7 @@
 import mock
 
 from django.test import RequestFactory
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django.contrib.auth.models import Permission, Group, AnonymousUser
 from django.contrib.messages.storage.fallback import FallbackStorage

admin_tests/subjects/test_views.py

@@ -1,6 +1,6 @@
 from nose import tools as nt
 from django.test import RequestFactory
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django.contrib.auth.models import Permission
 

admin_tests/users/test_views.py

@@ -9,7 +9,7 @@
 from django.test import RequestFactory
 from django.http import Http404
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django.contrib.auth.models import Permission
 from django.contrib.messages.storage.fallback import FallbackStorage

api/base/authentication/drf.py

@@ -30,7 +30,7 @@ def get_session_from_cookie(cookie_val):
     """
 
     try:
-        session_id = itsdangerous.Signer(settings.SECRET_KEY).unsign(cookie_val)
+        session_id = itsdangerous.Signer(settings.SECRET_KEY).unsign(cookie_val).decode()
     except itsdangerous.BadSignature:
         return None
     try:

api/base/pagination.py

@@ -1,6 +1,6 @@
 from django.utils import six
 from collections import OrderedDict
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.paginator import InvalidPage, Paginator as DjangoPaginator
 from django.db.models import QuerySet
 

api/base/urls.py

@@ -33,7 +33,7 @@
                 url(r'^status/', views.status_check, name='status_check'),
                 url(r'^actions/', include('api.actions.urls', namespace='actions')),
                 url(r'^addons/', include('api.addons.urls', namespace='addons')),
-                url(r'^alerts/', include('api.alerts.urls', namespace='alerts')),
+                url(r'^alerts/', include(('api.alerts.urls', 'alerts'), namespace='alerts')),
                 url(r'^applications/', include('api.applications.urls', namespace='applications')),
                 url(r'^citations/', include('api.citations.urls', namespace='citations')),
                 url(r'^collections/', include('api.collections.urls', namespace='collections')),
@@ -56,7 +56,7 @@
                 url(r'^regions/', include('api.regions.urls', namespace='regions')),
                 url(r'^providers/', include('api.providers.urls', namespace='providers')),
                 url(r'^registrations/', include('api.registrations.urls', namespace='registrations')),
-                url(r'^requests/', include('api.requests.urls', namespace='requests')),
+                url(r'^requests/', include(('api.requests.urls', 'requests'), namespace='requests')),
                 url(r'^scopes/', include('api.scopes.urls', namespace='scopes')),
                 url(r'^search/', include('api.search.urls', namespace='search')),
                 url(r'^sparse/', include('api.sparse.urls', namespace='sparse')),
@@ -68,7 +68,7 @@
                 url(r'^users/', include('api.users.urls', namespace='users')),
                 url(r'^view_only_links/', include('api.view_only_links.urls', namespace='view-only-links')),
                 url(r'^wikis/', include('api.wikis.urls', namespace='wikis')),
-                url(r'^_waffle/', include('api.waffle.urls', namespace='waffle')),
+                url(r'^_waffle/', include(('api.waffle.urls', 'waffle'), namespace='waffle')),
             ],
         ),
     ),