Merge pull request #4965 from GeoNode/backport-4958-to-2.10.x

[Backport 2.10.x] [Fixes #4949] UnicodeEncodeError in upload.models.update_from_session
GeoNode · Sep 28, 2019 · 52530dd · 52530dd
2 parents 985e0c8 + 2a6fb9b
commit 52530dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/geonode/upload/models.py b/geonode/upload/models.py
@@ -97,8 +97,8 @@ def update_from_session(self, upload_session):
             self.session = None
         else:
             # Make sure we don't pickle UTF-8 chars
-            upload_session.user.first_name = u'{}'.format(upload_session.user.first_name).decode("utf-8", "replace")
-            upload_session.user.last_name = u'{}'.format(upload_session.user.last_name).decode("utf-8", "replace")
+            upload_session.user.first_name = upload_session.user.first_name.encode("ascii", "ignore")
+            upload_session.user.last_name = upload_session.user.last_name.encode("ascii", "ignore")
             unicode_session = pickle.dumps(upload_session)
             self.session = unicode_session.decode("utf-8", "replace")
         if self.upload_dir is None:

diff --git a/geonode/upload/tests/integration.py b/geonode/upload/tests/integration.py
@@ -90,6 +90,8 @@
 # create test user if needed, delete all layers and set password
 u, created = Profile.objects.get_or_create(username=GEONODE_USER)
 if created:
+    u.first_name = "Jhònà"
+    u.last_name = "çénü"
     u.set_password(GEONODE_PASSWD)
     u.save()
 else: