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

Specified when open should use binary mode. 

Thanks Vinaj Sajip for the help of his django3 branch.
parent e73838b6

django/contrib/formtools/tests/wizard/namedwizardtests/tests.py

+8 −6
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class NamedWizardTests(object): 
        self.assertEqual(response.context['wizard']['steps'].current, 'form2')



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(

            reverse(self.wizard_urlname,

                    kwargs={'step': response.context['wizard']['steps'].current}),
@@ -147,7 +147,7 @@ class NamedWizardTests(object): 
        self.assertEqual(response.status_code, 200)



        all_data = response.context['form_list']

        self.assertEqual(all_data[1]['file1'].read(), open(__file__).read())

        self.assertEqual(all_data[1]['file1'].read(), open(__file__, 'rb').read())

        del all_data[1]['file1']

        self.assertEqual(all_data, [

            {'name': u'Pony', 'thirsty': True, 'user': self.testuser},
@@ -168,7 +168,7 @@ class NamedWizardTests(object): 
        self.assertEqual(response.status_code, 200)



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(

            reverse(self.wizard_urlname,

                    kwargs={'step': response.context['wizard']['steps'].current}),
@@ -180,7 +180,9 @@ class NamedWizardTests(object): 
        response = self.client.get(step2_url)

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.context['wizard']['steps'].current, 'form2')

        self.assertEqual(response.context['wizard']['form'].files['form2-file1'].read(), open(__file__).read())

        self.assertEqual(

            response.context['wizard']['form'].files['form2-file1'].read(),

            open(__file__, 'rb').read())



        response = self.client.post(

            reverse(self.wizard_urlname,
@@ -197,7 +199,7 @@ class NamedWizardTests(object): 
        self.assertEqual(response.status_code, 200)



        all_data = response.context['all_cleaned_data']

        self.assertEqual(all_data['file1'].read(), open(__file__).read())

        self.assertEqual(all_data['file1'].read(), open(__file__, 'rb').read())

        del all_data['file1']

        self.assertEqual(

            all_data,
@@ -221,7 +223,7 @@ class NamedWizardTests(object): 
        self.assertEqual(response.status_code, 200)



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(

            reverse(self.wizard_urlname,

                    kwargs={'step': response.context['wizard']['steps'].current}),

django/contrib/formtools/tests/wizard/wizardtests/tests.py

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class WizardTests(object): 
        self.assertEqual(response.context['wizard']['steps'].current, 'form2')



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(self.wizard_url, post_data)

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.context['wizard']['steps'].current, 'form3')
@@ -93,7 +93,7 @@ class WizardTests(object): 
        self.assertEqual(response.status_code, 200)



        all_data = response.context['form_list']

        self.assertEqual(all_data[1]['file1'].read(), open(__file__).read())

        self.assertEqual(all_data[1]['file1'].read(), open(__file__, 'rb').read())

        del all_data[1]['file1']

        self.assertEqual(all_data, [

            {'name': u'Pony', 'thirsty': True, 'user': self.testuser},
@@ -110,7 +110,7 @@ class WizardTests(object): 
        self.assertEqual(response.status_code, 200)



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(self.wizard_url, post_data)

        self.assertEqual(response.status_code, 200)
@@ -121,7 +121,7 @@ class WizardTests(object): 
        self.assertEqual(response.status_code, 200)



        all_data = response.context['all_cleaned_data']

        self.assertEqual(all_data['file1'].read(), open(__file__).read())

        self.assertEqual(all_data['file1'].read(), open(__file__, 'rb').read())

        del all_data['file1']

        self.assertEqual(all_data, {

            'name': u'Pony', 'thirsty': True, 'user': self.testuser,
@@ -138,7 +138,7 @@ class WizardTests(object): 
        self.assertEqual(response.status_code, 200)



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(self.wizard_url, post_data)

        self.assertEqual(response.status_code, 200)
@@ -165,7 +165,7 @@ class WizardTests(object): 
        self.assertEqual(response.context['wizard']['steps'].current, 'form2')



        post_data = self.wizard_step_data[1]

        post_data['form2-file1'] = open(__file__)

        post_data['form2-file1'] = open(__file__, 'rb')

        response = self.client.post(self.wizard_url, post_data)

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.context['wizard']['steps'].current, 'form3')

django/core/management/commands/compilemessages.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from optparse import make_option 
from django.core.management.base import BaseCommand, CommandError



def has_bom(fn):

    with open(fn, 'r') as f:

    with open(fn, 'rb') as f:

        sample = f.read(4)

    return sample[:3] == '\xef\xbb\xbf' or \

            sample.startswith(codecs.BOM_UTF16_LE) or \

django/template/loaders/app_directories.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Loader(BaseLoader): 
    def load_template_source(self, template_name, template_dirs=None):

        for filepath in self.get_template_sources(template_name, template_dirs):

            try:

                with open(filepath) as fp:

                with open(filepath, 'rb') as fp:

                    return (fp.read().decode(settings.FILE_CHARSET), filepath)

            except IOError:

                pass

django/template/loaders/filesystem.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class Loader(BaseLoader): 
        tried = []

        for filepath in self.get_template_sources(template_name, template_dirs):

            try:

                with open(filepath) as fp:

                with open(filepath, 'rb') as fp:

                    return (fp.read().decode(settings.FILE_CHARSET), filepath)

            except IOError:

                tried.append(filepath)