Mark read_utf8_with_fallback as private

Author: abravalheri

setuptools/command/develop.py

@@ -10,7 +10,7 @@
 from setuptools import namespaces
 import setuptools
 
-from ..unicode_utils import read_utf8_with_fallback
+from ..unicode_utils import _read_utf8_with_fallback
 
 
 class develop(namespaces.DevelopInstaller, easy_install):
@@ -133,7 +133,7 @@ def uninstall_link(self):
 
             contents = [
                 line.rstrip()
-                for line in read_utf8_with_fallback(self.egg_link).splitlines()
+                for line in _read_utf8_with_fallback(self.egg_link).splitlines()
             ]
 
             if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
@@ -161,7 +161,7 @@ def install_egg_scripts(self, dist):
         for script_name in self.distribution.scripts or []:
             script_path = os.path.abspath(convert_path(script_name))
             script_name = os.path.basename(script_path)
-            script_text = read_utf8_with_fallback(script_path)
+            script_text = _read_utf8_with_fallback(script_path)
             self.install_script(dist, script_name, script_text, script_path)
 
         return None

setuptools/package_index.py

@@ -41,7 +41,7 @@
 from setuptools.extern.more_itertools import unique_everseen
 
 from .compat import py39
-from .unicode_utils import read_utf8_with_fallback
+from .unicode_utils import _read_utf8_with_fallback
 
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
@@ -1121,7 +1121,7 @@ def local_open(url):
         for f in os.listdir(filename):
             filepath = os.path.join(filename, f)
             if f == 'index.html':
-                body = read_utf8_with_fallback(filepath)
+                body = _read_utf8_with_fallback(filepath)
                 break
             elif os.path.isdir(filepath):
                 f += '/'

setuptools/unicode_utils.py

@@ -46,7 +46,7 @@ def try_encode(string, enc):
         return None
 
 
-def read_utf8_with_fallback(file: str, fallback_encoding=py39.LOCALE_ENCODING) -> str:
+def _read_utf8_with_fallback(file: str, fallback_encoding=py39.LOCALE_ENCODING) -> str:
     """
     First try to read the file with UTF-8, if there is an error fallback to a
     different encoding ("locale" by default). Returns the content of the file.

setuptools/wheel.py

@@ -18,7 +18,7 @@
 from setuptools.command.egg_info import write_requirements, _egg_basename
 from setuptools.archive_util import _unpack_zipfile_obj
 
-from .unicode_utils import read_utf8_with_fallback
+from .unicode_utils import _read_utf8_with_fallback
 
 
 WHEEL_NAME = re.compile(
@@ -224,7 +224,7 @@ def _move_data_entries(destination_eggdir, dist_data):
     def _fix_namespace_packages(egg_info, destination_eggdir):
         namespace_packages = os.path.join(egg_info, 'namespace_packages.txt')
         if os.path.exists(namespace_packages):
-            namespace_packages = read_utf8_with_fallback(namespace_packages).split()
+            namespace_packages = _read_utf8_with_fallback(namespace_packages).split()
 
             for mod in namespace_packages:
                 mod_dir = os.path.join(destination_eggdir, *mod.split('.'))