Merge branch 'djay/fix_None_in_filter' into djay/5.0.x_integration

collective · Jul 9, 2019 · 0851f0b · 0851f0b
2 parents 7bbb039 + 36dde6e
commit 0851f0b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/collective/collectionfilter/tests/test_filteritems.py b/src/collective/collectionfilter/tests/test_filteritems.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 """Setup tests for this package."""
 import unittest
-from urlparse import urlparse, parse_qs
+try:
+    from urllib.parse import urlparse, parse_qs
+except:
+    from urlparse import urlparse, parse_qs
 
 from plone.app.contenttypes.interfaces import ICollection