Django2

cradmin_legacy/apps/cradmin_activate_account/tests/test_activate.py

@@ -3,7 +3,7 @@
 from django.contrib import messages
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 import htmls

cradmin_legacy/apps/cradmin_activate_account/tests/test_utils.py

@@ -15,12 +15,12 @@ def setUp(self):
 
     def test_generate_token(self):
         token = ActivationEmail(user=self.testuser, next_url='/', request=mock.MagicMock()).generate_token()
-        self.assertEquals(token.metadata['next_url'], '/')
+        self.assertEqual(token.metadata['next_url'], '/')
 
     def test_generate_token_no_next_url(self):
         with self.settings(LOGIN_URL='/next'):
             token = ActivationEmail(user=self.testuser, request=mock.MagicMock()).generate_token()
-        self.assertEquals(token.metadata['next_url'], '/next')
+        self.assertEqual(token.metadata['next_url'], '/next')
 
     def test_send(self):
         testtoken = mock.MagicMock()

cradmin_legacy/apps/cradmin_activate_account/utils.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from cradmin_legacy.apps.cradmin_email import emailutils
 from django_cradmin.apps.cradmin_generic_token_with_metadata.models import GenericTokenWithMetadata, \

cradmin_legacy/apps/cradmin_authenticate/tests/test_email_auth_backend.py

@@ -13,7 +13,7 @@ def setUp(self):
     def test_get_user_from_email(self):
         user = self.emailauthbackend._EmailAuthBackend__get_user_from_email(self.testuser.email)
         self.assertIsNotNone(user)
-        self.assertEquals(user.pk, self.testuser.pk)
+        self.assertEqual(user.pk, self.testuser.pk)
 
     def test_get_user_from_email_returns_none(self):
         user = self.emailauthbackend._EmailAuthBackend__get_user_from_email('doesnotexist@example.com')
@@ -22,7 +22,7 @@ def test_get_user_from_email_returns_none(self):
     def test_get_user(self):
         user = self.emailauthbackend.get_user(self.testuser.pk)
         self.assertIsNotNone(user)
-        self.assertEquals(user.pk, self.testuser.pk)
+        self.assertEqual(user.pk, self.testuser.pk)
 
     def test_get_user_returns_none(self):
         user = self.emailauthbackend.get_user(42)
@@ -31,7 +31,7 @@ def test_get_user_returns_none(self):
     def test_authenticate(self):
         user = self.emailauthbackend.authenticate(email=self.testuser.email, password='test')
         self.assertIsNotNone(user)
-        self.assertEquals(self.testuser.pk, user.pk)
+        self.assertEqual(self.testuser.pk, user.pk)
 
     def test_authenticate_invalid_password_returns_none(self):
         user = self.emailauthbackend.authenticate(email=self.testuser.email, password='notcorrectpassword')

cradmin_legacy/apps/cradmin_authenticate/tests/test_login.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import htmls
 from cradmin_legacy.apps.cradmin_authenticate.tests.cradmin_authenticate_testapp.models import EmailUser
 from django.test.utils import override_settings
@@ -15,23 +15,23 @@ def setUp(self):
 
     def test_get(self):
         response = self.client.get(self.url)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         selector = htmls.S(response.content)
-        self.assertEquals(selector.one('h1').alltext_normalized, 'Sign in')
+        self.assertEqual(selector.one('h1').alltext_normalized, 'Sign in')
 
     def test_login_ok(self):
         response = self.client.post(self.url, {
             'username': 'testuser',
             'password': 'test'
         })
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
 
     def test_login_invalid(self):
         response = self.client.post(self.url, {
             'username': 'testuser',
             'password': 'invalid'
         })
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         selector = htmls.S(response.content)
         self.assertIn(
             "Your username and password didn't match",
@@ -47,33 +47,33 @@ def setUp(self):
 
     def test_get(self):
         response = self.client.get(self.url)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         selector = htmls.S(response.content)
-        self.assertEquals(selector.one('h1').alltext_normalized, 'Sign in')
+        self.assertEqual(selector.one('h1').alltext_normalized, 'Sign in')
 
     def test_login_ok(self):
         with self.settings(LOGIN_REDIRECT_URL='/login/redirect'):
             response = self.client.post(self.url, {
                 'email': 'testuser@example.com',
                 'password': 'test'
             })
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
         self.assertEqual(response['location'], '/login/redirect')
 
     def test_login_next(self):
         response = self.client.post('{}?next=/next'.format(self.url), {
             'email': 'testuser@example.com',
             'password': 'test'
         })
-        self.assertEquals(response.status_code, 302)
+        self.assertEqual(response.status_code, 302)
         self.assertEqual(response['location'], '/next')
 
     def test_login_invalid(self):
         response = self.client.post(self.url, {
             'email': 'testuser@example.com',
             'password': 'invalid'
         })
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         selector = htmls.S(response.content)
         self.assertIn(
             "Your email and password didn't match",

cradmin_legacy/apps/cradmin_authenticate/views/login.py

@@ -170,7 +170,7 @@ def get(self, *args, **kwargs):
         """
         if user is authenticated, redirect to ``settings.LOGIN_REDIRECT_URL``, else render the login form.
         """
-        if self.request.user.is_authenticated():
+        if self.request.user.is_authenticated:
             return HttpResponseRedirect(settings.LOGIN_REDIRECT_URL)
         else:
             return super(LoginView, self).get(*args, **kwargs)
@@ -250,9 +250,9 @@ def get_success_url(self):
         if present, or ``settings.LOGIN_REDIRECT_URL`` if not.
         """
         if 'next' in self.request.GET:
-            return self.request.GET['next']
+            return str(self.request.GET['next'])
         else:
-            return settings.LOGIN_REDIRECT_URL
+            return str(settings.LOGIN_REDIRECT_URL)
 
     def form_valid(self, form):
         """

cradmin_legacy/apps/cradmin_authenticate/views/logout.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 from django.conf import settings
-from django.contrib.auth.views import logout
+from django.contrib.auth import logout
 
 
 def cradmin_logoutview(request, template_name='cradmin_authenticate/logout.django.html'):

cradmin_legacy/apps/cradmin_imagearchive/cradminviews.py

@@ -341,7 +341,7 @@ def get_success_url(self):
         url = self.request.build_absolute_uri()
         uploaded_archiveimage = self.uploaded_archiveimages[0]
         url = create.CreateView.add_foreignkey_selected_value_to_url_querystring(url, uploaded_archiveimage.pk)
-        return url
+        return str(url)
 
 
 class ArchiveImageUpdateView(crudbase.OnlySaveButtonMixin,

cradmin_legacy/apps/cradmin_imagearchive/migrations/0001_initial.py

@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=255, blank=True, help_text='Give the image a name (optional). If you leave this blank, the name of the uploaded image file is used.', verbose_name='name')),
                 ('description', models.TextField(default='', blank=True, help_text='An optional description of the image. Think if this as a description of the image for visually impaired users. This means that you should describe the information carried in the image (if any).', verbose_name='description')),
                 ('created_datetime', models.DateTimeField(auto_now_add=True)),
-                ('role_content_type', models.ForeignKey(help_text='The role owning this image.', verbose_name='role', to='contenttypes.ContentType')),
+                ('role_content_type', models.ForeignKey(help_text='The role owning this image.', verbose_name='role', to='contenttypes.ContentType', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name_plural': 'archive images',

cradmin_legacy/apps/cradmin_imagearchive/models.py

@@ -42,7 +42,9 @@ class ArchiveImage(models.Model):
     role_content_type = models.ForeignKey(
         ContentType,
         verbose_name=_('role'),
-        help_text=_('The role owning this image.'))
+        help_text=_('The role owning this image.'),
+        on_delete=models.CASCADE
+    )
     role_object_id = models.PositiveIntegerField()
     role = GenericForeignKey('role_content_type', 'role_object_id')
 

cradmin_legacy/apps/cradmin_imagearchive/tests/test_cradminviews.py

@@ -45,7 +45,7 @@ def test_get_render(self):
         request.cradmin_role = self.role
 
         response = cradminviews.ArchiveImageUpdateView.as_view()(request, pk=self.archiveimage.pk)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         response.render()
         selector = htmls.S(response.content)
         self.assertTrue(selector.exists('textarea#id_description'))
@@ -63,8 +63,8 @@ def test_post_ok(self):
 
         self.assertEqual(ArchiveImage.objects.count(), 1)
         response = cradminviews.ArchiveImageUpdateView.as_view()(request, pk=self.archiveimage.pk)
-        self.assertEquals(response.status_code, 302)
-        self.assertEquals(response['Location'], '/success')
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response['Location'], '/success')
         self.assertEqual(ArchiveImage.objects.count(), 1)
         updated_image = ArchiveImage.objects.first()
         self.assertEqual(updated_image.image.read(), self.testimage)
@@ -144,7 +144,7 @@ def test_uploadform_get_render(self):
         mockresponse = self.mock_http200_getrequest_htmls(
             requestuser=create_user('testuser'),
             cradmin_role=testrole)
-        self.assertEquals(mockresponse.response.status_code, 200)
+        self.assertEqual(mockresponse.response.status_code, 200)
         self.assertTrue(mockresponse.selector.exists('#cradmin_legacy_imagearchive_bulkadd_form'))
         self.assertTrue(mockresponse.selector.exists('input[type=hidden][name=filecollectionid]'))
         self.assertTrue(mockresponse.selector.exists('#div_id_filecollectionid'))
@@ -183,7 +183,7 @@ def test_uploadform_post_single_image(self):
                 }
             })
 
-        self.assertEquals(mockresponse.response['Location'], '/success')
+        self.assertEqual(mockresponse.response['Location'], '/success')
         self.assertEqual(ArchiveImage.objects.count(), 1)
         created_image = ArchiveImage.objects.first()
         self.assertEqual(created_image.image.read(), testimage)
@@ -238,7 +238,7 @@ def test_uploadform_post_multiple_images(self):
                     'filecollectionid': collection.id
                 }
             })
-        self.assertEquals(mockresponse.response['Location'], '/success')
+        self.assertEqual(mockresponse.response['Location'], '/success')
         self.assertEqual(ArchiveImage.objects.count(), 2)
         created_images = ArchiveImage.objects.order_by('name')
 

cradmin_legacy/apps/cradmin_invite/baseviews/accept.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from django.shortcuts import render
@@ -190,7 +190,7 @@ def post(self, *args, **kwargs):
         If the user is authenticated, we return :meth:`~.AbstractAcceptInviteView.invite_accepted`.
         If the user is not authenticated, we raise :exc:`django.core.exceptions.PermissionDenied`.
         """
-        if self.request.user.is_authenticated():
+        if self.request.user.is_authenticated:
             return self.invite_accepted(self.generictoken)
         else:
             raise PermissionDenied()

cradmin_legacy/apps/cradmin_invite/tests/test_invite_url.py

@@ -50,15 +50,15 @@ def test_generate_generictoken(self):
             private=True,
             content_object=self.invite_target
         ).generate_generictoken()
-        self.assertEquals(token.content_object, self.invite_target)
+        self.assertEqual(token.content_object, self.invite_target)
 
     def test_generate_generictoken_with_email(self):
         token = InviteUrlMock(
             request=mock.MagicMock(),
             private=True,
             content_object=self.invite_target
         ).generate_generictoken(email='test@example.com')
-        self.assertEquals(token.metadata['email'], 'test@example.com')
+        self.assertEqual(token.metadata['email'], 'test@example.com')
 
     def test_generate_generictoken_with_email_and_metadata(self):
         token = InviteUrlMock(
@@ -67,8 +67,8 @@ def test_generate_generictoken_with_email_and_metadata(self):
             content_object=self.invite_target,
             metadata={'test': 10}
         ).generate_generictoken(email='test@example.com')
-        self.assertEquals(token.metadata['email'], 'test@example.com')
-        self.assertEquals(token.metadata['test'], 10)
+        self.assertEqual(token.metadata['email'], 'test@example.com')
+        self.assertEqual(token.metadata['test'], 10)
 
     def test_generate_generictoken_with_email_and_metadata_with_email(self):
         token = InviteUrlMock(
@@ -77,7 +77,7 @@ def test_generate_generictoken_with_email_and_metadata_with_email(self):
             content_object=self.invite_target,
             metadata={'email': 'existing@example.com'}
         ).generate_generictoken(email='test@example.com')
-        self.assertEquals(token.metadata['email'], 'existing@example.com')
+        self.assertEqual(token.metadata['email'], 'existing@example.com')
 
     def test_send_email(self):
         testrequest = mock.MagicMock()

cradmin_legacy/apps/cradmin_register_account/tests/forms/test_auth_user.py

@@ -25,9 +25,9 @@ def test_save(self):
             'email': 'test@example.com'
         })
         form.is_valid()
-        self.assertEquals(User.objects.count(), 0)
+        self.assertEqual(User.objects.count(), 0)
         form.save()
-        self.assertEquals(User.objects.count(), 1)
+        self.assertEqual(User.objects.count(), 1)
         created_user = User.objects.first()
         self.assertEqual(created_user.username, 'test')
         self.assertEqual(created_user.email, 'test@example.com')
@@ -42,7 +42,7 @@ def test_passwords_do_not_match(self):
             'email': 'unused@example.com'
         })
         self.assertFalse(form.is_valid())
-        self.assertEquals(form.non_field_errors(), [u'The passwords do not match.'])
+        self.assertEqual(form.non_field_errors(), [u'The passwords do not match.'])
 
     def test_email_is_not_unique(self):
         create_user('testuser', email='test@example.com')
@@ -53,7 +53,7 @@ def test_email_is_not_unique(self):
             'email': 'test@example.com'
         })
         self.assertFalse(form.is_valid())
-        self.assertEquals(form.errors, {
+        self.assertEqual(form.errors, {
             'email': [u'Account with this email address already exists.']
         })
 
@@ -86,9 +86,9 @@ def test_save(self):
             'email': 'test@example.com'
         })
         form.is_valid()
-        self.assertEquals(User.objects.count(), 0)
+        self.assertEqual(User.objects.count(), 0)
         form.save()
-        self.assertEquals(User.objects.count(), 1)
+        self.assertEqual(User.objects.count(), 1)
         created_user = User.objects.first()
         self.assertEqual(created_user.username, 'test@example.com')
         self.assertEqual(created_user.email, 'test@example.com')
@@ -102,7 +102,7 @@ def test_passwords_do_not_match(self):
             'email': 'unused@example.com'
         })
         self.assertFalse(form.is_valid())
-        self.assertEquals(form.non_field_errors(), [u'The passwords do not match.'])
+        self.assertEqual(form.non_field_errors(), [u'The passwords do not match.'])
 
     def test_email_is_not_unique(self):
         create_user('testuser', email='test@example.com')
@@ -112,7 +112,7 @@ def test_email_is_not_unique(self):
             'email': 'test@example.com'
         })
         self.assertFalse(form.is_valid())
-        self.assertEquals(form.errors, {
+        self.assertEqual(form.errors, {
             'email': [u'Account with this email address already exists.']
         })
 
@@ -125,7 +125,7 @@ def test_email_is_more_than_30_chars(self):
         })
         self.assertTrue(form.is_valid())
         user = form.save()
-        self.assertEquals(user.username, 'a.very.long.testuser@example.c')
+        self.assertEqual(user.username, 'a.very.long.testuser@example.c')
 
     def test_email_makes_username_not_unique(self):
         create_user(
@@ -137,5 +137,5 @@ def test_email_makes_username_not_unique(self):
             'email': 'a.very.long.testuser@example.com'
         })
         self.assertTrue(form.is_valid())
-        with self.assertRaisesRegexp(ValidationError, '^.*name already exists.*$'):
+        with self.assertRaisesRegex(ValidationError, '^.*name already exists.*$'):
             form.save()