From 7e23dcda18f657b1c13d1178142eda54a8556dc2 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Thu, 2 May 2024 17:38:02 +0200
Subject: [PATCH] Removes a DeprecationWarning about CatalogVocabularyFactory
 import

---
 news/454.bugfix                                  |  1 +
 setup.py                                         | 16 ++++++++--------
 .../app/multilingual/browser/vocabularies.py     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 news/454.bugfix

diff --git a/news/454.bugfix b/news/454.bugfix
new file mode 100644
index 00000000..981b67f9
--- /dev/null
+++ b/news/454.bugfix
@@ -0,0 +1 @@
+Removed DeprecationWarning from CatalogVocabularyFactory import. [@jensens]
\ No newline at end of file
diff --git a/setup.py b/setup.py
index add5ad67..fa6db140 100644
--- a/setup.py
+++ b/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": [
diff --git a/src/plone/app/multilingual/browser/vocabularies.py b/src/plone/app/multilingual/browser/vocabularies.py
index 33f2e59b..f62e6e71 100644
--- a/src/plone/app/multilingual/browser/vocabularies.py
+++ b/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