Some str/bytes fixes

Author: nigelm

CHANGELOG.md

@@ -8,6 +8,8 @@ Unreleased Changes
 ------------------
 
 <!-- insertion marker -->
+- Some str/bytes fixes
+
 [0.3.0] - 2021-01-11
 --------------------
 - Swap out `sh` for `subprocess` module for running pandoc

moin2gitwiki/cli.py

@@ -230,7 +230,7 @@ def translate_page(ctx, cache_directory, url_prefix, page, version):
 
     The first argument is a page name, the second an integer revision.
 
-    The translation process is as described for the `fast-expor`a command.
+    The translation process is as described for the `fast-export` command.
     """
     #
     # build your initial revision set from the wiki data

moin2gitwiki/moin2markdown.py

@@ -104,7 +104,7 @@ def create_translator(
             ctx=ctx,
         )
 
-    def retrieve_and_translate(self, revision: MoinEditEntry) -> Optional[str]:
+    def retrieve_and_translate(self, revision: MoinEditEntry) -> Optional[bytes]:
         """
         Retrieve a wiki revision, and translate it to markdown
 
@@ -186,15 +186,15 @@ def extract_content_section(self, html: str) -> str:
 
         return "".join([str(x) for x in content.contents])
 
-    def translate(self, input: str) -> str:
+    def translate(self, input: str) -> bytes:
         """Translate HTML to Github Flavoured Markdown using pandoc"""
         process = subprocess.Popen(
             ["pandoc", "-f", "html", "-t", "gfm"],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
         )
         (output, _) = process.communicate(input.encode("utf-8"))
-        return output.decode("utf-8")
+        return output
 
 
 # end