Merge pull request #159 from collective/codecleanup

Cleanup Code

src/collective/__init__.py

@@ -1,13 +1,2 @@
 # -*- coding: utf-8 -*-
 __import__("pkg_resources").declare_namespace(__name__)
-
-
-try:
-    from Products.CMFPlone.utils import get_top_request
-except ImportError:
-    # to make geolocation compatible we will patch plone
-    from collective.collectionfilter.utils import get_top_request
-
-    import Products.CMFPlone.utils
-
-    Products.CMFPlone.utils.get_top_request = get_top_request

src/collective/collectionfilter/__init__.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
-from plone.api import env
 from zope.i18nmessageid import MessageFactory
 
 
 _ = MessageFactory("collective.collectionfilter")
-
-PLONE_VERSION = env.plone_version()

src/collective/collectionfilter/baseviews.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from Acquisition import aq_inner
-from collective.collectionfilter import PLONE_VERSION
 from collective.collectionfilter.filteritems import get_filter_items
 from collective.collectionfilter.filteritems import ICollectionish
 from collective.collectionfilter.interfaces import IGroupByCriteria
@@ -118,10 +117,6 @@ def content_selector(self):
 
     @property
     def ajax_load(self):
-        if PLONE_VERSION < "5.1":
-            # Due to bug in AJAX load pattern makes it hard to make it work in 5.0.x
-            return False
-
         values = api.portal.get_registry_record("plone.patternoptions")
         if "collectionfilter" in values:
             filterOptions = json.loads(values["collectionfilter"])

src/collective/collectionfilter/interfaces.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from collective.collectionfilter import _
-from collective.collectionfilter import PLONE_VERSION
 from collective.collectionfilter import utils
 from plone.api.portal import get_registry_record as getrec
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
@@ -26,11 +25,6 @@ def pattern_options():
         "recentlyUsed": True,
         "selectableTypes": utils.target_collection_types,
     }
-    if PLONE_VERSION < "5.1":
-        del options["basePath"]
-        options["selectableTypes"] = [
-            "Collection",
-        ]
     return options