New upstream version 8.1.2.upstream/8.1.2

1 files changed, 4 insertions, 5 deletions

diff --git a/nikola/winutils.py b/nikola/winutils.py
index 3ea179b..a6506e6 100644
--- a/nikola/winutils.py
+++ b/nikola/winutils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2020 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -26,7 +26,6 @@
 
 """windows utilities to workaround problems with symlinks in a git clone."""
 
-from __future__ import print_function, unicode_literals
 import os
 import shutil
 import io
@@ -67,11 +66,11 @@ def fix_all_git_symlinked(topdir):
     """
     # Determine whether or not symlinks need fixing (they don’t if installing
     # from a .tar.gz file)
-    with io.open(topdir + r'\nikola\data\symlink-test-link.txt', 'r', encoding='utf-8') as f:
+    with io.open(topdir + r'\nikola\data\symlink-test-link.txt', 'r', encoding='utf-8-sig') as f:
         text = f.read()
         if text.startswith("NIKOLA_SYMLINKS=OK"):
             return -1
-    with io.open(topdir + r'\nikola\data\symlinked.txt', 'r', encoding='utf-8') as f:
+    with io.open(topdir + r'\nikola\data\symlinked.txt', 'r', encoding='utf-8-sig') as f:
         text = f.read()
     # expect each line a relpath from git or zip root,
     # smoke test relpaths are relative to git root
@@ -93,7 +92,7 @@ def fix_all_git_symlinked(topdir):
             continue
 
         # build src path and do some basic validation
-        with io.open(os.path.join(topdir, dst), 'r', encoding='utf-8') as f:
+        with io.open(os.path.join(topdir, dst), 'r', encoding='utf-8-sig') as f:
             text = f.read()
         dst_dir = os.path.dirname(dst)
         try: