Removes a DeprecationWarning about CatalogVocabularyFactory import

news/454.bugfix

@@ -0,0 +1 @@
+Removed DeprecationWarning from CatalogVocabularyFactory import. [@jensens]

setup.py

@@ -12,28 +12,22 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        "plone.i18n>=4.0.4",
-        "setuptools",
         "BTrees",
-        "Products.CMFCore",
-        "Products.CMFPlone",
-        "Products.GenericSetup",
-        "Products.statusmessages",
-        "Zope",
         "plone.app.content",
         "plone.app.contentmenu",
         "plone.app.dexterity",
         "plone.app.event",
         "plone.app.i18n",
         "plone.app.layout",
+        "plone.app.querystring",
         "plone.app.registry",
         "plone.app.uuid",
-        "plone.app.vocabularies",
         "plone.app.z3cform",
         "plone.autoform",
         "plone.base",
         "plone.behavior",
         "plone.dexterity",
+        "plone.i18n>=4.0.4",
         "plone.indexer",
         "plone.locking",
         "plone.memoize",
@@ -43,12 +37,18 @@
         "plone.supermodel",
         "plone.uuid",
         "plone.z3cform",
+        "Products.CMFCore",
+        "Products.CMFPlone",
+        "Products.GenericSetup",
+        "Products.statusmessages",
+        "setuptools",
         "z3c.form",
         "z3c.relationfield",
         "zc.relation",
         "zope.browsermenu",
         "zope.intid",
         "zope.pagetemplate",
+        "Zope",
     ],
     extras_require={
         "test": [

src/plone/app/multilingual/browser/vocabularies.py

@@ -1,6 +1,6 @@
 from plone.app.multilingual.browser.utils import is_language_independent
 from plone.app.multilingual.interfaces import ITranslationManager
-from plone.app.vocabularies.catalog import CatalogVocabularyFactory
+from plone.app.querystring.vocabularies import CatalogVocabularyFactory
 from plone.base.interfaces import ILanguage
 from plone.i18n.locales.interfaces import ILanguageAvailability
 from Products.CMFCore.utils import getToolByName