Django/1to2

designsafe/LoginTest.py

@@ -1,7 +1,7 @@
 #python manage.py test designsafe.LoginTest --settings=designsafe.settings.test_settings
 from django.test import TestCase, RequestFactory
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from designsafe.apps.auth.models import AgaveOAuthToken
 from designsafe.apps.auth.tasks import check_or_create_agave_home_dir

designsafe/apps/accounts/forms.py

@@ -2,7 +2,7 @@
 import logging
 from django import forms
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import escape

designsafe/apps/accounts/migrations/0001_initial.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
  ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
  ('ethnicity', models.CharField(max_length=255)),
  ('gender', models.CharField(max_length=255)),
- ('user', models.OneToOneField(related_name='profile', to=settings.AUTH_USER_MODEL)),
+ ('user', models.OneToOneField(related_name='profile', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
  ],
  ),
  ]

designsafe/apps/accounts/migrations/0002_notificationpreferences.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
  fields=[
  ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
  ('announcements', models.BooleanField(default=True, help_text='Receive occasional announcements from DesignSafe')),
- ('user', models.OneToOneField(related_name='notification_preferences', to=settings.AUTH_USER_MODEL)),
+ ('user', models.OneToOneField(related_name='notification_preferences', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
  ],
  ),
  ]

designsafe/apps/accounts/models.py

@@ -61,15 +61,15 @@ def __str__(self):
 
 
 class DesignSafeProfile(models.Model):
- user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='profile')
+ user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='profile', on_delete=models.CASCADE)
  ethnicity = models.CharField(max_length=255)
  gender = models.CharField(max_length=255)
  agree_to_account_limit = models.DateTimeField(auto_now_add=True, null=True)
  bio = models.CharField(max_length=4096, default=None, null=True, blank=True)
  website = models.CharField(max_length=256, default=None, null=True, blank=True)
  orcid_id = models.CharField(max_length=256, default=None, null=True, blank=True)
  nh_interests = models.ManyToManyField(DesignSafeProfileNHInterests)
- nh_interests_primary = models.ForeignKey(DesignSafeProfileNHInterests, related_name='nh_interests_primary', null=True)
+ nh_interests_primary = models.ForeignKey(DesignSafeProfileNHInterests, related_name='nh_interests_primary', null=True, on_delete=models.CASCADE)
  nh_technical_domains = models.ManyToManyField(DesignSafeProfileNHTechnicalDomains)
  professional_level = models.CharField(max_length=256, default=None, null=True)
  research_activities = models.ManyToManyField(DesignSafeProfileResearchActivities)
@@ -86,7 +86,7 @@ def send_mail(self, subject, body=None):
 
 class NotificationPreferences(models.Model):
  user = models.OneToOneField(settings.AUTH_USER_MODEL,
- related_name='notification_preferences')
+ related_name='notification_preferences', on_delete=models.CASCADE)
  announcements = models.BooleanField(
  default=True,
  verbose_name=_('Announcements: to communicate EF Workshops, NHERI Newsletter, Student Opportunities, etc.'))

designsafe/apps/accounts/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.contrib.auth import get_user_model, signals
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from unittest import skip
 from mock import patch
 import pytest

designsafe/apps/accounts/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from designsafe.apps.accounts import views
 

designsafe/apps/accounts/views.py

@@ -3,10 +3,9 @@
 from django.contrib.auth import get_user_model, logout
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render_to_response
 from django.utils.translation import ugettext_lazy as _
 from designsafe.apps.accounts import forms, integrations
 from designsafe.apps.accounts.models import (NEESUser, DesignSafeProfile,

designsafe/apps/api/datafiles/handlers.py

@@ -7,7 +7,7 @@
 from designsafe.apps.api.datafiles.operations import shared_operations
 from designsafe.apps.api.exceptions import ApiException
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 logger = logging.getLogger(__name__)
 

designsafe/apps/api/decorators.py

@@ -4,7 +4,6 @@
 import logging
 from functools import wraps
 from base64 import b64decode
-from django.utils.six import text_type
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth import login
@@ -52,7 +51,7 @@ def _get_jwt_payload(request):
  :rtype: str
  """
  payload = request.META.get(settings.AGAVE_JWT_HEADER)
- if payload and isinstance(payload, text_type):
+ if payload and isinstance(payload, str):
  # Header encoding (see RFC5987)
  payload = payload.encode('iso-8859-1')
 

designsafe/apps/api/notifications/tests.py

@@ -10,7 +10,7 @@
 from urllib.parse import urlencode
 from unittest import skip
 from django.dispatch import receiver
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from designsafe.apps.api.notifications.models import Notification
 from .receivers import send_notification_ws
 

designsafe/apps/api/notifications/views/api.py

@@ -1,7 +1,7 @@
 import logging
 from django.http.response import HttpResponseBadRequest
 from django.http import HttpResponse
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import render
 
 from designsafe.apps.api.notifications.models import Notification

designsafe/apps/api/notifications/views/webhooks.py

@@ -1,7 +1,7 @@
 from django.http.response import HttpResponseBadRequest
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.decorators import method_decorator
 from django.shortcuts import render

designsafe/apps/api/projects/tests.py

@@ -1,12 +1,15 @@
 from designsafe.apps.api.projects.fixtures import exp_instance_meta, exp_instance_resp, exp_entity_meta, exp_entity_json
+import pytest
 
+@pytest.mark.django_db
 def test_project_instance_get(client, mock_agave_client, authenticated_user):
  mock_agave_client.meta.getMetadata.return_value = exp_instance_meta
  resp = client.get('/api/projects/1052668239654088215-242ac119-0001-012/')
  actual = resp.json()
  expected = exp_instance_resp
  assert actual == expected
 
+@pytest.mark.django_db
 def test_project_meta_all(client, mock_agave_client, authenticated_user):
  mock_agave_client.meta.getMetadata.return_value = exp_instance_meta
  mock_agave_client.meta.listMetadata.return_value = exp_entity_meta

designsafe/apps/api/projects/views.py

@@ -3,7 +3,7 @@
 import logging
 import json
 from celery import group, chain
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from django.http.response import HttpResponseForbidden
 from django.http import JsonResponse, HttpResponseBadRequest

designsafe/apps/api/search/tests.py

@@ -2,7 +2,7 @@
 from django.test import TestCase
 from django.contrib.auth import get_user_model
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from designsafe.apps.api.search.views import SearchView
 import json
 

designsafe/apps/api/tasks.py

@@ -7,7 +7,7 @@
 import urllib.request, urllib.parse, urllib.error
 from datetime import datetime
 from celery import shared_task
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth import get_user_model
 from pytas.models import User as TASUser
 from django.conf import settings

designsafe/apps/api/urls.py

@@ -4,7 +4,7 @@
 from django.http import JsonResponse
 
 urlpatterns = [
- url(r'^projects/', include('designsafe.apps.api.projects.urls',
+ url(r'^projects/', include(('designsafe.apps.api.projects.urls', 'designsafe.apps.api.projects'),
  namespace='ds_projects_api')),
 
  url(r'^datafiles/', include('designsafe.apps.api.datafiles.urls')),
@@ -13,6 +13,6 @@
  url(r'^logger/$', LoggerApi.as_view(), name='logger'),
  url(r'^notifications/', include('designsafe.apps.api.notifications.urls')),
  url(r'^users/', include('designsafe.apps.api.users.urls')),
- url(r'^search/', include('designsafe.apps.api.search.urls', namespace="ds_search_api")),
+ url(r'^search/', include(('designsafe.apps.api.search.urls', 'designsafe.apps.api.search'), namespace="ds_search_api")),
  url(r'^licenses/', include('designsafe.apps.api.licenses.urls'))
 ]

designsafe/apps/applications/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from designsafe.apps.applications import views
 

designsafe/apps/applications/views.py

@@ -47,7 +47,7 @@ def call_api(request, service):
  :param request: http request from angular service
  :returns: JSON response for agave call
  """
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
  try:
  token = request.user.agave_oauth
  agave = Agave(api_server=settings.AGAVE_TENANT_BASEURL,

designsafe/apps/auth/middleware.py

@@ -2,11 +2,12 @@
 from django.core.exceptions import ObjectDoesNotExist
 from requests.exceptions import RequestException, HTTPError
 import logging
+from django.utils.deprecation import MiddlewareMixin
 
 logger = logging.getLogger(__name__)
 
 
-class AgaveTokenRefreshMiddleware(object):
+class AgaveTokenRefreshMiddleware(MiddlewareMixin):
 
  def process_request(self, request):
  if request.path != '/logout/' and request.user.is_authenticated:

designsafe/apps/auth/migrations/0001_initial.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
  ('refresh_token', models.CharField(max_length=255)),
  ('expires_in', models.BigIntegerField()),
  ('created', models.BigIntegerField()),
- ('user', models.OneToOneField(related_name='agave_oauth', to=settings.AUTH_USER_MODEL)),
+ ('user', models.OneToOneField(related_name='agave_oauth', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
  ],
  ),
  ]

designsafe/apps/auth/models.py

@@ -18,7 +18,7 @@
 AGAVE_RESOURCES = agave.load_resource(getattr(settings, 'AGAVE_TENANT_BASEURL'))
 
 class AgaveOAuthToken(models.Model):
- user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='agave_oauth')
+ user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='agave_oauth', on_delete=models.CASCADE)
  token_type = models.CharField(max_length=255)
  scope = models.CharField(max_length=255)
  access_token = models.CharField(max_length=255)

designsafe/apps/auth/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from designsafe.apps.auth import views
 

designsafe/apps/auth/views.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponseRedirect, HttpResponseBadRequest
 from django.shortcuts import render

designsafe/apps/box_integration/integrations.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 def provide_integrations():

designsafe/apps/box_integration/migrations/0001_initial.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
  ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
  ('access_token', models.CharField(max_length=255)),
  ('refresh_token', models.CharField(max_length=255)),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
  ],
  ),
  ]

designsafe/apps/box_integration/migrations/0003_auto_20160328_2215.py

@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
  migrations.AlterField(
  model_name='boxusertoken',
  name='user',
- field=models.OneToOneField(related_name='box_user_token', to=settings.AUTH_USER_MODEL),
+ field=models.OneToOneField(related_name='box_user_token', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
  ),
  ]

designsafe/apps/box_integration/models.py

@@ -8,7 +8,7 @@ class BoxUserToken(models.Model):
  """
  Represents an OAuth Token for a Box.com user
  """
- user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='box_user_token')
+ user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='box_user_token', on_delete=models.CASCADE)
  box_user_id = models.CharField(max_length=48)
  access_token = models.CharField(max_length=255)
  refresh_token = models.CharField(max_length=255)

designsafe/apps/box_integration/tests/test_views.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 from django.contrib.auth import get_user_model, signals
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from boxsdk.object.user import User
 from designsafe.apps.box_integration.models import BoxUserToken
 from designsafe.apps.auth.signals import on_user_logged_in

designsafe/apps/box_integration/views.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import (HttpResponseRedirect, HttpResponseBadRequest)
 from django.shortcuts import render
 from designsafe.apps.box_integration.models import BoxUserToken

designsafe/apps/cms_plugins/migrations/0001_initial.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
  migrations.CreateModel(
  name='ResponsiveEmbedPlugin',
  fields=[
- ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+ ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin', on_delete=models.CASCADE)),
  ('url', models.CharField(max_length=255)),
  ('aspect', models.CharField(max_length=255, choices=[(b'16by9', b'16by9'), (b'4by3', b'4by3'), (b'podcast', b'podcast')])),
  ],

designsafe/apps/dashboard/tests.py

@@ -5,7 +5,7 @@
 from django.test import TestCase
 from django.contrib.auth import get_user_model, signals
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from designsafe.apps.data.models.elasticsearch import IndexedFile
 
 logger = logging.getLogger(__name__)

designsafe/apps/dashboard/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from designsafe.apps.dashboard import views
 

designsafe/apps/data/management/commands/tests.py

@@ -23,6 +23,7 @@ def setUp(self):
 
  @patch('designsafe.apps.data.management.commands.swap_reindex.Command.handle')
  def test_working(self, mock_handle):
+ mock_handle.return_value='OK'
  opts = {'index': 'files'}
  call_command('swap_reindex', **opts)
  self.assertEqual(mock_handle.call_count, 1)

designsafe/apps/data/urls.py

@@ -5,7 +5,7 @@
  DataDepotPublishedView,
  DataDepotLegacyPublishedView
 )
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 urlpatterns = [

designsafe/apps/data/views/base.py

@@ -5,7 +5,7 @@
 from designsafe.apps.notifications.views import get_number_unread_notifications
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404, HttpResponse
 from django.shortcuts import resolve_url
 from django.utils.decorators import method_decorator

designsafe/apps/djangoRT/tests.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth import get_user_model, signals
 from unittest import skip
 import mock

designsafe/apps/djangoRT/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect, JsonResponse, HttpResponseBadRequest
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from designsafe.apps.djangoRT import rtUtil, forms, rtModels
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages

designsafe/apps/dropbox_integration/integrations.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 def provide_integrations():

designsafe/apps/dropbox_integration/migrations/0001_initial.py

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
  ('dropbox_user_id', models.CharField(max_length=48)),
  ('access_token', models.CharField(max_length=255)),
  ('refresh_token', models.CharField(max_length=255)),
- ('user', models.OneToOneField(related_name='dropbox_user_token', to=settings.AUTH_USER_MODEL)),
+ ('user', models.OneToOneField(related_name='dropbox_user_token', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
  ],
  ),
  ]