👹 Feed the hobgoblins (delint).

jaraco · jaraco · commit 3601d65f65ae · 2023-05-19T13:04:37.000-04:00
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
@@ -338,39 +338,47 @@ def test_add_from_site_is_ignored(self):
         assert not pth.dirty
 
     def test_many_pth_distributions_merge_together(self, tmpdir):
-        """Make sure that if the pth file is modified under the hood then PthDistribution
-        will refresh its content before saving, and merging contents when necessary.
+        """
+        If the pth file is modified under the hood, then PthDistribution
+        will refresh its content before saving, merging contents when
+        necessary.
         """
         # putting the pth file in a dedicated sub-folder,
         pth_subdir = tmpdir.join("pth_subdir")
         pth_subdir.mkdir()
         pth_path = str(pth_subdir.join("file1.pth"))
         pth1 = PthDistributions(pth_path)
         pth2 = PthDistributions(pth_path)
-        assert pth1.paths == pth2.paths == [], \
-            "unless there would be some default added at some point"
+        assert (
+            pth1.paths == pth2.paths == []
+        ), "unless there would be some default added at some point"
         # and so putting the src_subdir in folder distinct than the pth one,
         # so to keep it absolute by PthDistributions
         new_src_path = tmpdir.join("src_subdir")
         new_src_path.mkdir()  # must exist to be accounted
         new_src_path_str = str(new_src_path)
         pth1.paths.append(new_src_path_str)
         pth1.save()
-        assert pth1.paths, \
-            "first, the new_src_path added must still be present/valid in pth1 after save"
+        assert (
+            pth1.paths
+        ), "the new_src_path added must still be present/valid in pth1 after save"
         # now,
-        assert new_src_path_str not in pth2.paths, \
-            "right before we save the entry should still not be present"
+        assert (
+            new_src_path_str not in pth2.paths
+        ), "right before we save the entry should still not be present"
         pth2.save()
-        assert new_src_path_str in pth2.paths, \
-            "the new_src_path entry should have been added by pth2 with its save() call now"
-        assert pth2.paths[-1] == new_src_path, \
-            "and it should match exactly on the last entry actually " \
+        assert (
+            new_src_path_str in pth2.paths
+        ), "the new_src_path entry should have been added by pth2 with its save() call"
+        assert pth2.paths[-1] == new_src_path, (
+            "and it should match exactly on the last entry actually "
             "given we append to it in save()"
+        )
         # finally,
-        assert PthDistributions(pth_path).paths == pth2.paths, \
-            "and we should have the exact same list at the end " \
+        assert PthDistributions(pth_path).paths == pth2.paths, (
+            "and we should have the exact same list at the end "
             "with a fresh PthDistributions instance"
+        )
 
 
 @pytest.fixture
@@ -886,9 +894,15 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
             <html><head><title>Links for dep</title></head>
             <body>
                 <h1>Links for dep</h1>
+<<<<<<< Updated upstream
                 <a href="{dep_1_0_url}"\
 data-requires-python="{dep_1_0_python_requires}">{dep_1_0_sdist}</a><br/>
                 <a href="{dep_2_0_url}"\
+=======
+                <a href="{dep_1_0_url}" \
+data-requires-python="{dep_1_0_python_requires}">{dep_1_0_sdist}</a><br/>
+                <a href="{dep_2_0_url}" \
+>>>>>>> Stashed changes
 data-requires-python="{dep_2_0_python_requires}">{dep_2_0_sdist}</a><br/>
             </body>
             </html>
