summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/loaddata.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index da26c256ca..42dff67388 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -180,7 +180,8 @@ class Command(BaseCommand):
'\rProcessed %i object(s).' % loaded_objects_in_fixture,
ending=''
)
- except (DatabaseError, IntegrityError) as e:
+ # psycopg2 raises ValueError if data contains NUL chars.
+ except (DatabaseError, IntegrityError, ValueError) as e:
e.args = ("Could not load %(app_label)s.%(object_name)s(pk=%(pk)s): %(error_msg)s" % {
'app_label': obj.object._meta.app_label,
'object_name': obj.object._meta.object_name,