Delete unnecessary slashfix functions

Akuli · Akuli · commit d8317c90ab35 · 2022-09-10T16:12:59.000+03:00
diff --git a/common.py b/common.py
@@ -122,16 +122,6 @@ def askyesno(question, default=True):
         print("Please type y, n or nothing at all.")
 
 
-def slashfix(path):
-    """Replace / with os.sep."""
-    return path.replace('/', os.sep)
-
-
-def slashfix_open(file, mode):
-    """An easy way to use slashfix() and open() together."""
-    return open(slashfix(file), mode)
-
-
 @contextlib.contextmanager
 def backup(filename):
     """A context manager that backs up a file."""
diff --git a/linkcheck.py b/linkcheck.py
@@ -59,18 +59,17 @@ def check(this_file, target, title, titledict):
 
     path = posixpath.join(posixpath.dirname(this_file), target)
     path = posixpath.normpath(path)
-    real_path = common.slashfix(path)
 
-    if not os.path.exists(real_path):
+    if not os.path.exists(path):
         return "doesn't exist"
 
     if target.endswith('/'):
         # A directory.
-        if not os.path.isdir(real_path):
+        if not os.path.isdir(path):
             return "not a directory"
     else:
         # A file.
-        if not os.path.isfile(real_path):
+        if not os.path.isfile(path):
             return "not a file"
 
     if title is not None and title not in titledict[path]:
@@ -82,7 +81,7 @@ def find_titles(filename):
     """Read titles of a markdown file and return a list of them."""
     result = []
 
-    with common.slashfix_open(filename, 'r') as f:
+    with open(filename, 'r') as f:
         for line in f:
             if line.startswith('```'):
                 # it's a code block, let's skip to the end of it to
@@ -103,7 +102,7 @@ def find_links(this_file):
     """
     result = []
 
-    with common.slashfix_open(this_file, 'r') as f:
+    with open(this_file, 'r') as f:
         for match, lineno in common.find_links(f):
             target = match.group(2)
             if '#' in target:
@@ -122,7 +121,7 @@ def find_links(this_file):
 
 def get_line(filename, lineno):
     """Return the lineno'th line of a file."""
-    with common.slashfix_open(filename, 'r') as f:
+    with open(filename, 'r') as f:
         for lineno2, line in enumerate(f, start=1):
             if lineno == lineno2:
                 return line
diff --git a/make-html.py b/make-html.py
@@ -92,12 +92,11 @@ class TutorialStyle(pygments.style.Style):
 """
 
 
-def mkdir_slashfix_open(filename, mode):
-    """Like common.slashfix_open(), but make directories as needed."""
-    real_filename = common.slashfix(filename)
-    directory = os.path.dirname(real_filename)
+def mkdir_and_open(filename, mode):
+    """Like open(), but make directories as needed."""
+    directory = os.path.dirname(filename)
     os.makedirs(directory, exist_ok=True)
-    return open(real_filename, mode)
+    return open(filename, mode)
 
 
 def fix_filename(filename):
@@ -252,7 +251,7 @@ def main():
         htmlfile = posixpath.join(args.outdir, fixed_file)
         print('  %-30.30s  -->  %-30.30s' % (markdownfile, htmlfile), end='\r')
 
-        with common.slashfix_open(markdownfile, 'r') as f:
+        with open(markdownfile, 'r') as f:
             markdown = f.read()
         renderer = TutorialRenderer(args.pygments_style)
         body = mistune.markdown(markdown, renderer=renderer)
@@ -264,7 +263,7 @@ def main():
             body=body,
             stylefile=stylefile,
         )
-        with mkdir_slashfix_open(htmlfile, 'w') as f:
+        with mkdir_and_open(htmlfile, 'w') as f:
             print(html, file=f)
     print()
 
diff --git a/update-ends.py b/update-ends.py
@@ -85,7 +85,7 @@ def update_end(filename, end):
     separator.
     """
     end = '\n***\n\n' + end
-    with common.slashfix_open(filename, 'r') as f:
+    with open(filename, 'r') as f:
         content = f.read()
     if content.endswith(end):
         # No need to do anything.
@@ -96,11 +96,11 @@ def update_end(filename, end):
         # We need to remove the old ending first.
         print("  Removing old end:", filename)
         where = content.index('\n***\n')
-        with common.slashfix_open(filename, 'w') as f:
+        with open(filename, 'w') as f:
             f.write(content[:where])
 
     print("  Adding end:", filename)
-    with common.slashfix_open(filename, 'a') as f:
+    with open(filename, 'a') as f:
         f.write(end)
 
 
