From 6b2d3f9206e6eb2aafb75dcd0ef50ce672bc0ff3 Mon Sep 17 00:00:00 2001 From: Marc Tamlyn Date: Tue, 18 Nov 2014 20:24:48 +0000 Subject: Remove text-mangling of default values. --- django/contrib/postgres/fields/array.py | 8 -------- django/db/models/fields/__init__.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'django') diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index c28e3d6ca3..ae07f1bc0c 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -96,14 +96,6 @@ class ArrayField(Field): value = [self.base_field.to_python(val) for val in vals] return value - def get_default(self): - """Overridden from the default to prevent string-mangling.""" - if self.has_default(): - if callable(self.default): - return self.default() - return self.default - return None - def value_to_string(self, obj): values = [] vals = self._get_val_from_obj(obj) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 2c3efbb689..3b42c998b7 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -722,7 +722,7 @@ class Field(RegisterLookupMixin): if self.has_default(): if callable(self.default): return self.default() - return force_text(self.default, strings_only=True) + return self.default if (not self.empty_strings_allowed or (self.null and not connection.features.interprets_empty_strings_as_nulls)): return None -- cgit v1.3