fix 2 listsings in 9

Author: hjwp

chapter_09_docker.asciidoc

@@ -770,12 +770,12 @@ CMD python manage.py runserver
 
 <1> Here's where we create our virtualenv
 
-<3> You can't really "activate" a virtualenv inside a Dockerfile,
+<2> You can't really "activate" a virtualenv inside a Dockerfile,
     so instead we change the system PATH so that the venv versions
     of `pip` and `python` become the default ones
     (this is actually one of the things that `activate` does, under the hood).
 
-<2> We copy our requirements file in, just like the src folder.
+<3> We copy our requirements file in, just like the src folder.
 
 <4> Now we install our dependencies with `pip`,
     pointing it at our _requirements.txt_.
@@ -893,6 +893,7 @@ WORKDIR /src
 
 CMD python manage.py runserver 8888
 ----
+====
 
 Ctrl+C the current dockerized container process if it's still running in your terminal,
 give it another `build && run`:
@@ -1096,6 +1097,7 @@ WORKDIR /src
 
 CMD python manage.py runserver 0.0.0.0:8888
 ----
+====
 
 Rebuild and re-run your server, and if you have eagle eyes,
 you'll spot it's binding to `0.0.0.0` instead of `127.0.0.1`:

copy_html_to_site_and_print_toc.py

@@ -1,84 +1,83 @@
 #!/usr/bin/env python
 
+import json
+import subprocess
 from collections import namedtuple
 from pathlib import Path
-import json
+
 from lxml import html
-import subprocess
 
-DEST = Path('/home/harry/workspace/www.obeythetestinggoat.com/content/book')
+DEST = Path("~/workspace/www.obeythetestinggoat.com/content/book").expanduser()
 
 CHAPTERS = [
-    c.replace('.asciidoc', '.html')
-    for c in json.loads(open('atlas.json').read())['files']
+    c.replace(".asciidoc", ".html")
+    for c in json.loads(Path("atlas.json").read_text())["files"]
 ]
-for tweak_chap in ['praise.html', 'part1.html', 'part2.html', 'part3.html']:
-    CHAPTERS[CHAPTERS.index(tweak_chap)] = tweak_chap.replace('.', '.forbook.')
-CHAPTERS.remove('cover.html')
-CHAPTERS.remove('titlepage.html')
-CHAPTERS.remove('copyright.html')
-CHAPTERS.remove('toc.html')
-CHAPTERS.remove('ix.html')
-CHAPTERS.remove('author_bio.html')
-CHAPTERS.remove('colo.html')
+for tweak_chap in ["praise.html", "part1.html", "part2.html", "part3.html"]:
+    CHAPTERS[CHAPTERS.index(tweak_chap)] = tweak_chap.replace(".", ".forbook.")
+CHAPTERS.remove("cover.html")
+CHAPTERS.remove("titlepage.html")
+CHAPTERS.remove("copyright.html")
+CHAPTERS.remove("toc.html")
+CHAPTERS.remove("ix.html")
+CHAPTERS.remove("author_bio.html")
+CHAPTERS.remove("colo.html")
 
-ChapterInfo = namedtuple('ChapterInfo', 'href_id chapter_title subheaders xrefs')
+ChapterInfo = namedtuple("ChapterInfo", "href_id chapter_title subheaders xrefs")
 
 
 def make_chapters():
     for chapter in CHAPTERS:
-        subprocess.check_call(['make', chapter], stdout=subprocess.PIPE)
+        subprocess.check_call(["make", chapter], stdout=subprocess.PIPE)
 
 
 def parse_chapters():
     for chapter in CHAPTERS:
-        raw_html = open(chapter).read()
+        raw_html = Path(chapter).read_text()
         yield chapter, html.fromstring(raw_html)
 
 
 def get_anchor_targets(parsed_html):
-    ignores = {'header', 'content', 'footnotes', 'footer', 'footer-text'}
-    all_ids = [
-        a.get('id') for a in parsed_html.cssselect('*[id]')
-    ]
-    return [i for i in all_ids if not i.startswith('_') and i not in ignores]
+    ignores = {"header", "content", "footnotes", "footer", "footer-text"}
+    all_ids = [a.get("id") for a in parsed_html.cssselect("*[id]")]
+    return [i for i in all_ids if not i.startswith("_") and i not in ignores]
+
 
 def get_chapter_info():
     chapter_info = {}
-    appendix_numbers = list('ABCDEFGHIJKL')
+    appendix_numbers = list("ABCDEFGHIJKL")
     chapter_numbers = list(range(1, 100))
     part_numbers = list(range(1, 10))
 
     for chapter, parsed_html in parse_chapters():
-        print('getting info from', chapter)
+        print("getting info from", chapter)
 
-        if not parsed_html.cssselect('h2'):
-            header = parsed_html.cssselect('h1')[0]
+        if not parsed_html.cssselect("h2"):
+            header = parsed_html.cssselect("h1")[0]
         else:
-            header = parsed_html.cssselect('h2')[0]
-        href_id = header.get('id')
+            header = parsed_html.cssselect("h2")[0]
+        href_id = header.get("id")
         if href_id is None:
-            href_id = parsed_html.cssselect('body')[0].get('id')
-        subheaders = [h.get('id') for h in parsed_html.cssselect('h3')]
+            href_id = parsed_html.cssselect("body")[0].get("id")
+        subheaders = [h.get("id") for h in parsed_html.cssselect("h3")]
 
         chapter_title = header.text_content()
-        chapter_title = chapter_title.replace('Appendix A: ', '')
+        chapter_title = chapter_title.replace("Appendix A: ", "")
 
-        if chapter.startswith('chapter_'):
+        if chapter.startswith("chapter_"):
             chapter_no = chapter_numbers.pop(0)
-            chapter_title = f'Chapter {chapter_no}: {chapter_title}'
+            chapter_title = f"Chapter {chapter_no}: {chapter_title}"
 
-        if chapter.startswith('appendix_'):
+        if chapter.startswith("appendix_"):
             appendix_no = appendix_numbers.pop(0)
-            chapter_title = f'Appendix {appendix_no}: {chapter_title}'
+            chapter_title = f"Appendix {appendix_no}: {chapter_title}"
 
-        if chapter.startswith('part'):
+        if chapter.startswith("part"):
             part_no = part_numbers.pop(0)
-            chapter_title = f'Part {part_no}: {chapter_title}'
-
-        if chapter.startswith('epilogue'):
-            chapter_title = f'Epilogue: {chapter_title}'
+            chapter_title = f"Part {part_no}: {chapter_title}"
 
+        if chapter.startswith("epilogue"):
+            chapter_title = f"Epilogue: {chapter_title}"
 
         xrefs = get_anchor_targets(parsed_html)
         chapter_info[chapter] = ChapterInfo(href_id, chapter_title, subheaders, xrefs)
@@ -88,74 +87,78 @@ def get_chapter_info():
 
 def fix_xrefs(contents, chapter, chapter_info):
     parsed = html.fromstring(contents)
-    links = parsed.cssselect('a[href^=\#]')
+    links = parsed.cssselect(r"a[href^=\#]")
     for link in links:
         for other_chap in CHAPTERS:
             if other_chap == chapter:
                 continue
             chapter_id = chapter_info[other_chap].href_id
-            href = link.get('href')
-            targets = ['#' + x for x in chapter_info[other_chap].xrefs]
-            if href == '#' + chapter_id:
-                link.set('href', f'/book/{other_chap}')
+            href = link.get("href")
+            targets = ["#" + x for x in chapter_info[other_chap].xrefs]
+            if href == "#" + chapter_id:
+                link.set("href", f"/book/{other_chap}")
             elif href in targets:
-                link.set('href', f'/book/{other_chap}{href}')
+                link.set("href", f"/book/{other_chap}{href}")
 
     return html.tostring(parsed)
 
 
 def fix_title(contents, chapter, chapter_info):
     parsed = html.fromstring(contents)
-    titles = parsed.cssselect('h2')
-    if titles and titles[0].text.startswith('Appendix A'):
+    titles = parsed.cssselect("h2")
+    if titles and titles[0].text.startswith("Appendix A"):
         title = titles[0]
         title.text = chapter_info[chapter].chapter_title
     return html.tostring(parsed)
 
+
 def copy_chapters_across_with_fixes(chapter_info, fixed_toc):
-    comments_html = open('disqus_comments.html').read()
-    buy_book_div = html.fromstring(open('buy_the_book_banner.html').read())
-    analytics_div = html.fromstring(open('analytics.html').read())
-    load_toc_script = open('load_toc.js').read()
+    comments_html = Path("disqus_comments.html").read_text()
+    buy_book_div = html.fromstring(Path("buy_the_book_banner.html").read_text())
+    analytics_div = html.fromstring(Path("analytics.html").read_text())
+    load_toc_script = Path("load_toc.js").read_text()
 
     for chapter in CHAPTERS:
-        old_contents = open(chapter).read()
+        old_contents = Path(chapter).read_text()
         new_contents = fix_xrefs(old_contents, chapter, chapter_info)
         new_contents = fix_title(new_contents, chapter, chapter_info)
         parsed = html.fromstring(new_contents)
-        body = parsed.cssselect('body')[0]
-        if parsed.cssselect('#header'):
-            head = parsed.cssselect('head')[0]
-            head.append(html.fragment_fromstring('<script>' + load_toc_script + '</script>'))
-            body.set('class', 'article toc2 toc-left')
+        body = parsed.cssselect("body")[0]
+        if parsed.cssselect("#header"):
+            head = parsed.cssselect("head")[0]
+            head.append(
+                html.fragment_fromstring("<script>" + load_toc_script + "</script>")
+            )
+            body.set("class", "article toc2 toc-left")
         body.insert(0, buy_book_div)
-        body.append(html.fromstring(
-            comments_html.replace('CHAPTER_NAME', chapter.split('.')[0])
-        ))
+        body.append(
+            html.fromstring(
+                comments_html.replace("CHAPTER_NAME", chapter.split(".")[0])
+            )
+        )
         body.append(analytics_div)
         fixed_contents = html.tostring(parsed)
 
-        with open(DEST / chapter, 'w') as f:
-            f.write(fixed_contents.decode('utf8'))
-        with open(DEST / 'toc.html', 'w') as f:
-            f.write(html.tostring(fixed_toc).decode('utf8'))
+        with open(DEST / chapter, "w") as f:
+            f.write(fixed_contents.decode("utf8"))
+        with open(DEST / "toc.html", "w") as f:
+            f.write(html.tostring(fixed_toc).decode("utf8"))
 
 
 def extract_toc_from_book():
-    subprocess.check_call(['make', 'book.html'], stdout=subprocess.PIPE)
-    parsed = html.fromstring(open('book.html').read())
-    return parsed.cssselect('#toc')[0]
-
+    subprocess.check_call(["make", "book.html"], stdout=subprocess.PIPE)
+    parsed = html.fromstring(Path("book.html").read_text())
+    return parsed.cssselect("#toc")[0]
 
 
 def fix_toc(toc, chapter_info):
     href_mappings = {}
     for chapter in CHAPTERS:
         chap = chapter_info[chapter]
         if chap.href_id:
-            href_mappings['#' + chap.href_id] = f'/book/{chapter}'
+            href_mappings["#" + chap.href_id] = f"/book/{chapter}"
         for subheader in chap.subheaders:
-            href_mappings['#' + subheader] = f'/book/{chapter}#{subheader}'
+            href_mappings["#" + subheader] = f"/book/{chapter}#{subheader}"
 
     def fix_link(href):
         if href in href_mappings:
@@ -164,18 +167,21 @@ def fix_link(href):
             return href
 
     toc.rewrite_links(fix_link)
-    toc.set('class', 'toc2')
+    toc.set("class", "toc2")
     return toc
 
 
 def print_toc_md(chapter_info):
     for chapter in CHAPTERS:
         title = chapter_info[chapter].chapter_title
-        print(f'* [{title}](/book/{chapter})')
+        print(f"* [{title}](/book/{chapter})")
 
 
 def rsync_images():
-    subprocess.run(['rsync', '-a', '-v', 'images/', DEST / 'images/'])
+    subprocess.run(
+        ["rsync", "-a", "-v", "images/", DEST / "images/"],
+        check=True,
+    )
 
 
 def main():
@@ -188,5 +194,5 @@ def main():
     print_toc_md(chapter_info)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()