From d4396ace96c91332afe63a63f34a5e37ac7fbecd Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Thu, 23 Jan 2020 15:10:32 +0100
Subject: [PATCH] Handle empty address field value.

---
 addressfield/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addressfield/fields.py b/addressfield/fields.py
index f039b7181..8a7338237 100644
--- a/addressfield/fields.py
+++ b/addressfield/fields.py
@@ -60,6 +60,7 @@ class AddressField(forms.CharField):
 
     def prepare_value(self, value):
         try:
-            return json.loads(value)
+            # Handle empty value with "or".
+            return json.loads(value or {})
         except TypeError:
             return value
-- 
GitLab