refactor: a little new-hashing pre-work

Author: nedbat

cogapp/cogapp.py

@@ -349,8 +349,8 @@ def __init__(self):
 
     def _fix_end_output_patterns(self):
         end_output = re.escape(self.options.end_output)
-        self.re_end_output = re.compile(
-            end_output + r"(?P<hashsect> *\(checksum: (?P<hash>[a-f0-9]+)\))"
+        self.re_end_output_with_hash = re.compile(
+            end_output + r"(?P<hashsect> *\(checksum: (?P<hash>[a-f0-9]{32})\))"
         )
         self.end_format = self.options.end_output + " (checksum: %s)"
 
@@ -458,7 +458,7 @@ def process_file(self, file_in, file_out, fname=None, globals=None):
                 if not self.options.delete_code:
                     file_out.write(line)
 
-                # l is the begin spec
+                # `line` is the begin spec
                 gen = CogGenerator(options=self.options)
                 gen.set_output(stdout=self.stdout)
                 gen.parse_marker(line)
@@ -561,7 +561,7 @@ def process_file(self, file_in, file_out, fname=None, globals=None):
                 saw_cog = True
 
                 # Write the ending output line
-                hash_match = self.re_end_output.search(line)
+                hash_match = self.re_end_output_with_hash.search(line)
                 if self.options.hash_output:
                     if hash_match:
                         old_hash = hash_match["hash"]

cogapp/test_cogapp.py

@@ -2314,15 +2314,15 @@ def test_create_checksum_output(self):
                 cog.outl("This line was generated.")
                 //]]]
                 This line was generated.
-                //[[[end]]]
+                //[[[end]]] what
                 This line was not.
                 """,
             "cog1.out": """\
                 //[[[cog
                 cog.outl("This line was generated.")
                 //]]]
                 This line was generated.
-                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)
+                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) what
                 This line was not.
                 """,
         }
@@ -2340,7 +2340,7 @@ def test_check_checksum_output(self):
                 cog.outl("blah blah.")
                 //]]]
                 This line was generated.
-                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)
+                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) end
                 """,
             "cog1.out": """\
                 //[[[cog
@@ -2351,7 +2351,7 @@ def test_check_checksum_output(self):
                 This line was newly
                 generated by cog
                 blah blah.
-                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)
+                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346) end
                 """,
         }