Stop using .settings.pep_base_url in various places

Author: AA-Turner

pep_sphinx_extensions/pep_processor/parsing/pep_role.py

@@ -8,9 +8,8 @@ class PEPRole(roles.PEP):
 
     def build_uri(self) -> str:
         """Get PEP URI from role text."""
-        base_url = self.inliner.document.settings.pep_base_url
         pep_num, _, fragment = self.target.partition("#")
-        pep_base = base_url + pep_url.format(int(pep_num))
+        pep_base = pep_url.format(int(pep_num))
         if fragment:
             return f"{pep_base}#{fragment}"
         return pep_base

pep_sphinx_extensions/pep_processor/transforms/pep_contents.py

@@ -44,19 +44,12 @@ def __init__(self, document, startnode=None):
         self.backlinks = None
 
     def apply(self) -> None:
-
-        # let the writer (or output software) build the contents list?
-        if getattr(self.document.settings, "use_latex_toc", False):
-            # move customisation settings to the parent node
-            self.startnode.parent.attributes.update(self.startnode.details)
-            self.startnode.parent.remove(self.startnode)
+        contents = self.build_contents(self.document[0][4:])  # skip PEP title, headers, <hr/>, and contents
+        if contents:
+            self.startnode.replace_self(contents)
         else:
-            contents = self.build_contents(self.document[0][4:])  # skip PEP title, headers, <hr/>, and contents
-            if contents:
-                self.startnode.replace_self(contents)
-            else:
-                # if no contents, remove the empty placeholder
-                self.startnode.parent.parent.remove(self.startnode.parent)
+            # if no contents, remove the empty placeholder
+            self.startnode.parent.parent.remove(self.startnode.parent)
 
     def build_contents(self, node, level=0):
         level += 1

pep_sphinx_extensions/pep_processor/transforms/pep_headers.py

@@ -79,12 +79,9 @@ def apply(self) -> None:
             elif name in {"replaces", "superseded-by", "requires"}:
                 # replace PEP numbers with normalised list of links to PEPs
                 new_body = []
-                space = nodes.Text(" ")
                 for ref_pep in re.split(r",?\s+", body.astext()):
-                    new_body.append(nodes.reference(
-                        ref_pep, ref_pep,
-                        refuri=(self.document.settings.pep_base_url + pep_url.format(int(ref_pep)))))
-                    new_body.append(space)
+                    new_body += [nodes.reference("", ref_pep, refuri=pep_url.format(int(ref_pep)))]
+                    new_body += [nodes.Text(", ")]
                 para[:] = new_body[:-1]  # drop trailing space
             elif name in {"last-modified", "content-type", "version"}:
                 # Mark unneeded fields

pep_sphinx_extensions/pep_processor/transforms/pep_zero.py

@@ -68,7 +68,7 @@ def visit_entry(self, node: nodes.entry) -> None:
             if isinstance(para, nodes.paragraph) and len(para) == 1:
                 pep_str = para.astext()
                 try:
-                    ref = self.document.settings.pep_base_url + pep_url.format(int(pep_str))
+                    ref = pep_url.format(int(pep_str))
                     para[0] = nodes.reference(pep_str, pep_str, refuri=ref)
                 except ValueError:
                     pass