Commit 66021033 authored by Claude Paroz's avatar Claude Paroz
Browse files

[py3] Various minor syntax fixes in the test suite

parent 7d0f8831

tests/modeltests/files/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -135,6 +135,6 @@ class FileTests(unittest.TestCase): 
    def test_file_mode(self):

        # Should not set mode to None if it is not present.

        # See #14681, stdlib gzip module crashes if mode is set to None

        file = SimpleUploadedFile("mode_test.txt", "content")

        file = SimpleUploadedFile("mode_test.txt", b"content")

        self.assertFalse(hasattr(file, 'mode'))

        g = gzip.GzipFile(fileobj=file)

tests/regressiontests/decorators/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ class MethodDecoratorTests(TestCase): 
        self.assertEqual(getattr(Test.method, 'myattr2', False), True)



        self.assertEqual(Test.method.__doc__, 'A method')

        self.assertEqual(Test.method.__func__.__name__, 'method')

        self.assertEqual(Test.method.__name__, 'method')





class XFrameOptionsDecoratorsTests(TestCase):

tests/regressiontests/fixtures_regress/tests.py

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ from django.db.models import signals 
from django.test import (TestCase, TransactionTestCase, skipIfDBFeature,

    skipUnlessDBFeature)

from django.test.utils import override_settings

from django.utils.six import StringIO

from django.utils.six import PY3, StringIO



from .models import (Animal, Stuff, Absolute, Parent, Child, Article, Widget,

    Store, Person, Book, NKChild, RefToNKChild, Circle1, Circle2, Circle3,
@@ -244,7 +244,8 @@ class TestFixtures(TestCase): 
            self.assertEqual(

                pre_save_checks,

                [

                    ("Count = 42 (<type 'int'>)", "Weight = 1.2 (<type 'float'>)")

                    ("Count = 42 (<%s 'int'>)" % ('class' if PY3 else 'type'),

                     "Weight = 1.2 (<%s 'float'>)" % ('class' if PY3 else 'type'))

                ]

            )

        finally:

tests/regressiontests/forms/tests/models.py

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ class RelatedModelFormTests(TestCase): 
        class Meta:

            model=A



        self.assertRaises(ValueError, ModelFormMetaclass, b'Form', (ModelForm,), {'Meta': Meta})

        self.assertRaises(ValueError, ModelFormMetaclass, str('Form'), (ModelForm,), {'Meta': Meta})



        class B(models.Model):

            pass
@@ -196,4 +196,4 @@ class RelatedModelFormTests(TestCase): 
        class Meta:

            model=A



        self.assertTrue(issubclass(ModelFormMetaclass(b'Form', (ModelForm,), {'Meta': Meta}), ModelForm))
 
        self.assertTrue(issubclass(ModelFormMetaclass(str('Form'), (ModelForm,), {'Meta': Meta}), ModelForm))

tests/regressiontests/generic_views/base.py

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ViewTest(unittest.TestCase): 


    def _assert_simple(self, response):

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.content, 'This is a simple view')

        self.assertEqual(response.content, b'This is a simple view')



    def test_no_init_kwargs(self):

        """