Commit 9908201d authored by Claude Paroz's avatar Claude Paroz
Browse files

Replaced some byte strings by str() calls 

This is a useful trick when Python 2 awaits byte strings and
Python 3 Unicode (regular) strings.
parent 2407c45c

django/core/handlers/wsgi.py

+1 −1
Original line number Diff line number Diff line
@@ -245,6 +245,6 @@ class WSGIHandler(base.BaseHandler): 
        status = '%s %s' % (response.status_code, status_text)

        response_headers = [(str(k), str(v)) for k, v in response.items()]

        for c in response.cookies.values():

            response_headers.append((b'Set-Cookie', str(c.output(header=''))))

            response_headers.append((str('Set-Cookie'), str(c.output(header=''))))

        start_response(smart_str(status), response_headers)

        return response

django/db/backends/sqlite3/base.py

+9 −9
Original line number Diff line number Diff line
@@ -54,15 +54,15 @@ def adapt_datetime_with_timezone_support(value): 
            default_timezone = timezone.get_default_timezone()

            value = timezone.make_aware(value, default_timezone)

        value = value.astimezone(timezone.utc).replace(tzinfo=None)

    return value.isoformat(b" ")



Database.register_converter(b"bool", lambda s: str(s) == '1')

Database.register_converter(b"time", parse_time)

Database.register_converter(b"date", parse_date)

Database.register_converter(b"datetime", parse_datetime_with_timezone_support)

Database.register_converter(b"timestamp", parse_datetime_with_timezone_support)

Database.register_converter(b"TIMESTAMP", parse_datetime_with_timezone_support)

Database.register_converter(b"decimal", util.typecast_decimal)

    return value.isoformat(str(" "))



Database.register_converter(str("bool"), lambda s: str(s) == '1')

Database.register_converter(str("time"), parse_time)

Database.register_converter(str("date"), parse_date)

Database.register_converter(str("datetime"), parse_datetime_with_timezone_support)

Database.register_converter(str("timestamp"), parse_datetime_with_timezone_support)

Database.register_converter(str("TIMESTAMP"), parse_datetime_with_timezone_support)

Database.register_converter(str("decimal"), util.typecast_decimal)

Database.register_adapter(datetime.datetime, adapt_datetime_with_timezone_support)

Database.register_adapter(decimal.Decimal, util.rev_typecast_decimal)

if Database.version_info >= (2, 4, 1):

django/db/models/base.py

+2 −2
Original line number Diff line number Diff line
@@ -63,12 +63,12 @@ class ModelBase(type): 


        new_class.add_to_class('_meta', Options(meta, **kwargs))

        if not abstract:

            new_class.add_to_class('DoesNotExist', subclass_exception(b'DoesNotExist',

            new_class.add_to_class('DoesNotExist', subclass_exception(str('DoesNotExist'),

                    tuple(x.DoesNotExist

                          for x in parents if hasattr(x, '_meta') and not x._meta.abstract)

                    or (ObjectDoesNotExist,),

                    module, attached_to=new_class))

            new_class.add_to_class('MultipleObjectsReturned', subclass_exception(b'MultipleObjectsReturned',

            new_class.add_to_class('MultipleObjectsReturned', subclass_exception(str('MultipleObjectsReturned'),

                    tuple(x.MultipleObjectsReturned

                          for x in parents if hasattr(x, '_meta') and not x._meta.abstract)

                    or (MultipleObjectsReturned,),

django/forms/formsets.py

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, 
    attrs = {'form': form, 'extra': extra,

             'can_order': can_order, 'can_delete': can_delete,

             'max_num': max_num}

    return type(form.__name__ + b'FormSet', (formset,), attrs)

    return type(form.__name__ + str('FormSet'), (formset,), attrs)



def all_valid(formsets):

    """Returns true if every formset in formsets is valid."""

django/forms/models.py

+2 −2
Original line number Diff line number Diff line
@@ -389,10 +389,10 @@ def modelform_factory(model, form=ModelForm, fields=None, exclude=None, 
    parent = (object,)

    if hasattr(form, 'Meta'):

        parent = (form.Meta, object)

    Meta = type(b'Meta', parent, attrs)

    Meta = type(str('Meta'), parent, attrs)



    # Give this new form class a reasonable name.

    class_name = model.__name__ + b'Form'

    class_name = model.__name__ + str('Form')



    # Class attributes for the new form class.

    form_class_attrs = {