Fix Python2 vs. Python3 text and bytes handling in the calendar portlet.

plone · Aug 6, 2019 · cdc83d5 · cdc83d5
1 parent 7fcbb4a
commit cdc83d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/news/308.bugfix b/news/308.bugfix
@@ -0,0 +1 @@
+Fix Python2 vs. Python3 text and bytes handling in the calendar portlet.
diff --git a/plone/app/event/portlets/portlet_calendar.py b/plone/app/event/portlets/portlet_calendar.py
@@ -279,12 +279,16 @@ def cal_data(self):
         return caldata
 
     def nav_pattern_options(self, year, month):
+        val = self.hash
+        if isinstance(val, bytes):
+            val = val.decode("utf-8")
+
         return json.dumps({
             'url': '%s/@@render-portlet?portlethash=%s&year=%s&month=%s' % (
                 getSite().absolute_url(),
-                self.hash,
+                val,
                 year, month),
-            'target': '#portletwrapper-%s > *' % self.hash
+            'target': '#portletwrapper-%s > *' % val
         })
 
     @property