p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used BaseSimpleSerializer for serializing str and bytes in migrations. 

Follow up to c716fe8782.
This commit is contained in:
Sergey Fedoseev 2017-11-14 00:12:46 +05:00 committed by Tim Graham
parent b5ecbf1e12
commit a2ec1e6b2d
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/db/migrations/serializer.py
View File

@ -46,11 +46,6 @@ class BaseSimpleSerializer(BaseSerializer):
return repr(self.value), set() return repr(self.value), set()
class ByteTypeSerializer(BaseSerializer):
def serialize(self):
return repr(self.value), set()
class DatetimeSerializer(BaseSerializer): class DatetimeSerializer(BaseSerializer):
def serialize(self): def serialize(self):
if self.value.tzinfo is not None and self.value.tzinfo != utc: if self.value.tzinfo is not None and self.value.tzinfo != utc:
@ -254,11 +249,6 @@ class SettingsReferenceSerializer(BaseSerializer):
return "settings.%s" % self.value.setting_name, {"from django.conf import settings"} return "settings.%s" % self.value.setting_name, {"from django.conf import settings"}
class TextTypeSerializer(BaseSerializer):
def serialize(self):
return repr(self.value), set()
class TimedeltaSerializer(BaseSerializer): class TimedeltaSerializer(BaseSerializer):
def serialize(self): def serialize(self):
return repr(self.value), {"import datetime"} return repr(self.value), {"import datetime"}
@ -346,12 +336,8 @@ def serializer_factory(value):
return SettingsReferenceSerializer(value) return SettingsReferenceSerializer(value)
if isinstance(value, float): if isinstance(value, float):
return FloatSerializer(value) return FloatSerializer(value)
if isinstance(value, (bool, int, type(None))): if isinstance(value, (bool, int, type(None), bytes, str)):
return BaseSimpleSerializer(value) return BaseSimpleSerializer(value)
if isinstance(value, bytes):
return ByteTypeSerializer(value)
if isinstance(value, str):
return TextTypeSerializer(value)
if isinstance(value, decimal.Decimal): if isinstance(value, decimal.Decimal):
return DecimalSerializer(value) return DecimalSerializer(value)
if isinstance(value, functools.partial): if isinstance(value, functools.partial):