Merge pull request #38 from plone/fix-circular-dependency-CMFPlone

Fix circular dependency on CMFPlone.
plone · Mar 11, 2023 · c9bd6da · c9bd6da
2 parents 965a744 + e4eada2
commit c9bd6da
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 10 deletions.
diff --git a/news/38.bugfix b/news/38.bugfix
@@ -0,0 +1,2 @@
+Remove circular dependency on Products.CMFPlone. Use moved imports from plone.base instead.
+[jensens]
diff --git a/plone/session/configure.zcml b/plone/session/configure.zcml
@@ -12,7 +12,7 @@
   <include file="resources.zcml" />
   <include
       file="profiles.zcml"
-      zcml:condition="installed Products.CMFPlone"
+      zcml:condition="installed plone.base"
   />
 
 </configure>
diff --git a/plone/session/hiddenprofiles.py b/plone/session/hiddenprofiles.py
@@ -1,4 +1,4 @@
-from Products.CMFPlone.interfaces import INonInstallable
+from plone.base.interfaces import INonInstallable
 from zope.interface import implementer
 
 

diff --git a/plone/session/profiles/default/registry.xml b/plone/session/profiles/default/registry.xml
@@ -6,7 +6,7 @@
   ===============================
   -->
   <records
-      interface="Products.CMFPlone.interfaces.IBundleRegistry"
+      interface="plone.base.interfaces.IBundleRegistry"
       prefix="plone.bundles/plone-session">
     <value key="enabled">True</value>
     <value key="jscompilation">++resource++plone.session.refreshsupport.js</value>

diff --git a/plone/session/profiles/uninstall/registry.xml b/plone/session/profiles/uninstall/registry.xml
@@ -2,7 +2,7 @@
 <registry>
 
   <records
-      interface="Products.CMFPlone.interfaces.IBundleRegistry"
+      interface="plone.base.interfaces.IBundleRegistry"
       prefix="plone.bundles/plone-session"
       remove="true">
   </records>

diff --git a/plone/session/tests/testPAS.py b/plone/session/tests/testPAS.py
@@ -27,7 +27,6 @@ def setCookie(
 
 
 class TestSessionPlugin(unittest.TestCase):
-
     layer = PLONE_SEESION_FUNCTIONAL_TESTING
     userid = "jbloggs"
 

diff --git a/plone/session/tktauth.py b/plone/session/tktauth.py
@@ -163,7 +163,7 @@ def safe_text(value, encoding="utf-8"):
     elif isinstance(value, bytes):
         try:
             value = str(value, encoding)
-        except (UnicodeDecodeError):
+        except UnicodeDecodeError:
             value = value.decode("utf-8", "replace")
     return value
 

diff --git a/setup.py b/setup.py
@@ -45,15 +45,11 @@
         ]
     ),
     install_requires=[
-        "AccessControl",
         "plone.keyring",
         "plone.protect",
         "Products.GenericSetup",
-        "Products.CMFPlone",
         "Products.PluggableAuthService",
         "setuptools",
-        "zope.component",
-        "zope.interface",
         "Zope",
     ],
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Remove circular dependency on Products.CMFPlone. Use moved imports from plone.base instead.
		[jensens]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,6 @@ def setCookie(


		class TestSessionPlugin(unittest.TestCase):

		layer = PLONE_SEESION_FUNCTIONAL_TESTING
		userid = "jbloggs"

Expand Down