Merge pull request #105 from reinout/gforcada-remove-plone-behaviors

Do not scan for plone behaviors
reinout · Mar 3, 2023 · 3c6bb65 · 3c6bb65
2 parents 3530c17 + c31fc46
commit 3c6bb65
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 45 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog of z3c.dependencychecker
   when scanning for files with dependencies.
   [gforcada]
 
+- Do not scan Plone FTI files for behaviors with dotted names.
+  [gforcada]
+
 2.10 (2023-01-30)
 -----------------
 

diff --git a/z3c/dependencychecker/modules.py b/z3c/dependencychecker/modules.py
@@ -228,15 +228,7 @@ def scan(self):
         for node in tree.iter("property"):
             if "name" in node.keys():
                 name = node.get("name")
-                if name == "behaviors":
-                    for subnode in node.iter("element"):
-                        if "value" in subnode.keys():
-                            yield DottedName(
-                                subnode.get("value"),
-                                file_path=self.path,
-                                is_test=self.testing,
-                            )
-                elif name in ("klass", "schema"):
+                if name in ("klass", "schema"):
                     if node.text:
                         yield DottedName(
                             node.text.strip(),

diff --git a/z3c/dependencychecker/tests/test_integration.py b/z3c/dependencychecker/tests/test_integration.py
@@ -12,8 +12,6 @@
      Products.GenericSetup.interfaces.EXTENSION
      missing.req
      other.generic.setup.dependency
-     plone.app.content.interfaces.INameFromTitle
-     plone.app.dexterity.behaviors.metadata.IBasic
      plone.random1.interfaces.IMySchema
      plone.random2.content.MyType
      some_django_app

diff --git a/z3c/dependencychecker/tests/test_modules_fti.py b/z3c/dependencychecker/tests/test_modules_fti.py
@@ -20,18 +20,6 @@
   <element class="my.behavior"/>
 </property>
 """
-ONE_BEHAVIOR = """
-<property name="behaviors">
-  <element value="my.behavior"/>
-</property>
-"""
-MORE_BEHAVIORS = """
-<property name="behaviors">
-  <element value="my.behavior1"/>
-  <element value="my.behavior2"/>
-  <element value="my.behavior3"/>
-</property>
-"""
 KLASS = """
 <property name="klass">my.class.package</property>
 """
@@ -91,28 +79,6 @@ def test_behavior_without_value(tmpdir):
     assert len(dotted_names) == 0
 
 
-def test_one_behavior(tmpdir):
-    dotted_names = _get_fti_imports_on_file(tmpdir, ONE_BEHAVIOR)
-    assert len(dotted_names) == 1
-
-
-def test_one_behavior_details(tmpdir):
-    dotted_names = _get_fti_imports_on_file(tmpdir, ONE_BEHAVIOR)
-    assert dotted_names == ["my.behavior"]
-
-
-def test_more_behaviors(tmpdir):
-    dotted_names = _get_fti_imports_on_file(tmpdir, MORE_BEHAVIORS)
-    assert len(dotted_names) == 3
-
-
-def test_more_behaviors_details(tmpdir):
-    dotted_names = _get_fti_imports_on_file(tmpdir, MORE_BEHAVIORS)
-    assert "my.behavior1" in dotted_names
-    assert "my.behavior2" in dotted_names
-    assert "my.behavior3" in dotted_names
-
-
 def test_klass(tmpdir):
     dotted_names = _get_fti_imports_on_file(tmpdir, KLASS)
     assert len(dotted_names) == 1