b/w compat import

Co-authored-by: Wildcard Corp. <corporate@wildcardcorp.com>
plone · Nov 15, 2018 · 778207a · 778207a
1 parent 68c5214
commit 778207a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 3.1.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Python 3 compatibility
+  [vangheem]
 
 
 3.1.0 (2018-07-05)

diff --git a/plone/app/tiles/drafting.py b/plone/app/tiles/drafting.py
@@ -10,12 +10,15 @@
 from plone.tiles.data import ANNOTATIONS_KEY_PREFIX
 from plone.tiles.interfaces import ITile
 from plone.tiles.interfaces import ITileDataContext
-from urllib.parse import urlparse
 from zope.annotation.interfaces import IAnnotations
 from zope.component import adapter
 from zope.interface import Interface
 from zope.interface import implementer
 
+try:
+    from urlparse import urlparse
+except ImportError:
+    from urllib.parse import urlparse
 try:
     from plone.app.drafts.dexterity import IDisplayFormDrafting
 except ImportError: