From fbbc17da7e25fa7d81a2a0071b76ad1a7a2ea3a4 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <stollenwerk@kitconcept.com>
Date: Thu, 31 Oct 2019 13:53:17 +0100
Subject: [PATCH] Fix path2uid for py2.

---
 src/plone/restapi/deserializer/blocks.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plone/restapi/deserializer/blocks.py b/src/plone/restapi/deserializer/blocks.py
index 62d480603f..443aa6f74b 100644
--- a/src/plone/restapi/deserializer/blocks.py
+++ b/src/plone/restapi/deserializer/blocks.py
@@ -11,10 +11,12 @@
 from zope.interface import implementer
 from zope.publisher.interfaces.browser import IBrowserRequest
 
+import six
+
 
 def path2uid(context, path):
-    # convert bytestring -> string; unrestrictedTraverse does not work with bytestrings
-    path = path.decode("utf-8")
+    if isinstance(path, six.binary_type):
+        path = path.decode("utf-8")
     obj = context.unrestrictedTraverse(path, None)
     if obj is None:
         return None, None