Skip to content

Commit 4242952

Browse files
committed
make import conditional
1 parent d0230c8 commit 4242952

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

src/collective/exportimport/export_content.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from collective.exportimport.interfaces import IRawRichTextMarker
1010
from operator import itemgetter
1111
from plone import api
12-
from plone.app.contenttypes.interfaces import ICollection
1312
from plone.app.layout.viewlets.content import ContentHistoryViewlet
1413
from plone.i18n.normalizer.interfaces import IIDNormalizer
1514
from plone.restapi.interfaces import ISerializeToJson
@@ -59,6 +58,16 @@
5958

6059
HAS_DX = True
6160

61+
try:
62+
pkg_resources.get_distribution("plone.app.contenttypes")
63+
except pkg_resources.DistributionNotFound:
64+
ICollection = None
65+
HAS_PAC = False
66+
else:
67+
from plone.app.contenttypes.interfaces import ICollection
68+
69+
HAS_PAC = True
70+
6271
try:
6372
pkg_resources.get_distribution("z3c.relationfield")
6473
except pkg_resources.DistributionNotFound:
@@ -387,7 +396,7 @@ def export_content(self):
387396
item = serializer()
388397
elif getattr(aq_base(obj), "isPrincipiaFolderish", False):
389398
item = serializer(include_items=False)
390-
elif ICollection.providedBy(obj):
399+
elif HAS_PAC and ICollection.providedBy(obj):
391400
item = serializer(include_items=False)
392401
else:
393402
item = serializer()

0 commit comments

Comments
 (0)