Fix encodings for various generated files

get-poetry.py

@@ -17,6 +17,7 @@
 directory, it will look for them in the base system.
 """
 import argparse
+import io
 import json
 import os
 import platform
@@ -152,7 +153,7 @@ def run(self):
         print(colorize("info", "Retrieving metadata"))
 
         r = urlopen(self.METADATA_URL)
-        metadata = json.loads(r.read().decode())
+        metadata = json.loads(r.read().decode("utf-8"))
         r.close()
 
         def _compare_versions(x, y):
@@ -281,7 +282,7 @@ def install(self, version):
             wheel_data = os.path.join(
                 dist, "poetry-{}.dist-info".format(version), "WHEEL"
             )
-            with open(wheel_data) as f:
+            with io.open(wheel_data, encoding="utf-8") as f:
                 wheel_data = Parser().parsestr(f.read())
 
             tag = wheel_data["Tag"]

poetry/console/commands/develop.py

@@ -28,7 +28,7 @@ def handle(self):
         else:
             builder = SdistBuilder(self.poetry, NullVenv(), NullIO())
 
-            with setup.open("w") as f:
+            with setup.open("w", encoding="utf-8") as f:
                 f.write(decode(builder.build_setup()))
 
         try:

poetry/console/commands/init.py

@@ -143,7 +143,7 @@ def handle(self):
 
             return 1
 
-        with (Path.cwd() / "pyproject.toml").open("w") as f:
+        with (Path.cwd() / "pyproject.toml").open("w", encoding="utf-8") as f:
             f.write(content)
 
     def _determine_requirements(

poetry/console/commands/self/update.py

@@ -143,7 +143,7 @@ def update(self, release):
                     os.unlink(str(file))
 
             wheel_data = dist / "poetry-{}.dist-info".format(version) / "WHEEL"
-            with wheel_data.open() as f:
+            with wheel_data.open(encoding="utf-8") as f:
                 wheel_data = Parser().parsestr(f.read())
 
             tag = wheel_data["Tag"]

poetry/json/__init__.py

@@ -1,3 +1,4 @@
+import io
 import json
 import os
 
@@ -17,7 +18,7 @@ def validate_object(obj, schema_name):  # type: (dict, str) -> None
     if not os.path.exists(schema):
         raise ValueError("Schema {} does not exist.".format(schema_name))
 
-    with open(schema) as f:
+    with io.open(schema, encoding="utf-8") as f:
         schema = json.loads(f.read())
 
     try:

poetry/layouts/layout.py

@@ -125,7 +125,7 @@ def _create_tests(self, path):
         tests.mkdir()
         tests_init.touch(exist_ok=False)
 
-        with tests_default.open("w") as f:
+        with tests_default.open("w", encoding="utf-8") as f:
             f.write(
                 TESTS_DEFAULT.format(
                     package_name=self._package_name, version=self._version
@@ -137,5 +137,5 @@ def _write_poetry(self, path):
 
         poetry = path / "pyproject.toml"
 
-        with poetry.open("w") as f:
+        with poetry.open("w", encoding="utf-8") as f:
             f.write(content)

poetry/layouts/src.py

@@ -14,5 +14,5 @@ def _create_default(self, path):
 
         package_path.mkdir(parents=True)
 
-        with package_init.open("w") as f:
+        with package_init.open("w", encoding="utf-8") as f:
             f.write(DEFAULT.format(version=self._version))

poetry/layouts/standard.py

@@ -14,5 +14,5 @@ def _create_default(self, path):
 
         package_path.mkdir()
 
-        with package_init.open("w") as f:
+        with package_init.open("w", encoding="utf-8") as f:
             f.write(DEFAULT.format(version=self._version))

poetry/masonry/builders/wheel.py

@@ -2,6 +2,7 @@
 
 import contextlib
 import hashlib
+import io
 import os
 import re
 import tempfile
@@ -233,7 +234,7 @@ def _add_file(self, wheel, full_path, rel_path):
             zinfo.external_attr |= 0x10  # MS-DOS directory flag
 
         hashsum = hashlib.sha256()
-        with open(full_path, "rb") as src:
+        with io.open(full_path, "rb") as src:
             while True:
                 buf = src.read(1024 * 8)
                 if not buf:

poetry/masonry/metadata.py

@@ -46,7 +46,7 @@ def from_package(cls, package):  # type: (...) -> Metadata
         meta.version = normalize_version(package.version.text)
         meta.summary = package.description
         if package.readme:
-            with package.readme.open() as f:
+            with package.readme.open(encoding="utf-8") as f:
                 meta.description = f.read()
 
         meta.keywords = ",".join(package.keywords)

poetry/packages/directory_dependency.py

@@ -70,7 +70,7 @@ def __init__(
             poetry = Poetry.create(self._full_path)
             builder = SdistBuilder(poetry, NullVenv(), NullIO())
 
-            with setup.open("w") as f:
+            with setup.open("w", encoding="utf-8") as f:
                 f.write(decode(builder.build_setup()))
 
             package = poetry.package
@@ -102,7 +102,7 @@ def __init__(
                 reqs = []
                 requires = egg_info / "requires.txt"
                 if requires.exists():
-                    with requires.open() as f:
+                    with requires.open(encoding="utf-8") as f:
                         reqs = parse_requires(f.read())
 
             package = Package(meta.name, meta.version)

poetry/puzzle/provider.py

@@ -203,7 +203,7 @@ def search_for_vcs(self, dependency):  # type: (VCSDependency) -> List[Package]
                         reqs = []
                         requires = egg_info / "requires.txt"
                         if requires.exists():
-                            with requires.open() as f:
+                            with requires.open(encoding="utf-8") as f:
                                 reqs = parse_requires(f.read())
 
                     package = Package(meta.name, meta.version)

poetry/repositories/legacy_repository.py

@@ -1,4 +1,5 @@
 import cgi
+import io
 import re
 
 try:
@@ -341,7 +342,7 @@ def _get_release_info(self, name, version):  # type: (str, str) -> dict
 
     def _download(self, url, dest):  # type: (str, str) -> None
         r = self._session.get(url, stream=True)
-        with open(dest, "wb") as f:
+        with io.open(dest, "wb") as f:
             for chunk in r.iter_content(chunk_size=1024):
                 if chunk:
                     f.write(chunk)

poetry/repositories/pypi_repository.py

@@ -1,4 +1,5 @@
 import logging
+import io
 import os
 import re
 import tarfile
@@ -451,7 +452,7 @@ def _get_info_from_sdist(
 
                 requires = egg_info / "requires.txt"
                 if requires.exists():
-                    with requires.open() as f:
+                    with requires.open(encoding="utf-8") as f:
                         info["requires_dist"] = parse_requires(f.read())
 
                         return info
@@ -463,7 +464,7 @@ def _get_info_from_sdist(
 
                 requires = egg_info / "requires.txt"
                 if requires.exists():
-                    with requires.open() as f:
+                    with requires.open(encoding="utf-8") as f:
                         info["requires_dist"] = parse_requires(f.read())
 
                         return info
@@ -501,7 +502,7 @@ def _inspect_sdist_with_setup(self, sdist_dir):
             else:
                 requires = egg_info / "requires.txt"
                 if requires.exists():
-                    with requires.open() as f:
+                    with requires.open(encoding="utf-8") as f:
                         info["requires_dist"] = parse_requires(f.read())
         except Exception:
             pass
@@ -512,7 +513,7 @@ def _inspect_sdist_with_setup(self, sdist_dir):
 
     def _download(self, url, dest):  # type: (str, str) -> None
         r = get(url, stream=True)
-        with open(dest, "wb") as f:
+        with io.open(dest, "wb") as f:
             for chunk in r.iter_content(chunk_size=1024):
                 if chunk:
                     f.write(chunk)

poetry/spdx/__init__.py

@@ -1,3 +1,4 @@
+import io
 import json
 import os
 
@@ -26,7 +27,7 @@ def load_licenses():
 
     licenses_file = os.path.join(os.path.dirname(__file__), "data", "licenses.json")
 
-    with open(licenses_file) as f:
+    with io.open(licenses_file, encoding="utf-8") as f:
         data = json.loads(f.read())
 
     for name, license in data.items():

poetry/spdx/updater.py

@@ -1,3 +1,4 @@
+import io
 import json
 import os
 
@@ -20,15 +21,15 @@ def dump(self, file=None):
 
         licenses_url = self._base_url + "licenses.json"
 
-        with open(file, "w") as f:
+        with io.open(file, "w", encoding="utf-8") as f:
             f.write(
                 json.dumps(self.get_licenses(licenses_url), indent=2, sort_keys=True)
             )
 
     def get_licenses(self, url):
         licenses = {}
         with urlopen(url) as r:
-            data = json.loads(r.read().decode())
+            data = json.loads(r.read().decode("utf-8"))
 
         for info in data["licenses"]:
             licenses[info["licenseId"]] = [

tests/console/conftest.py

@@ -143,15 +143,15 @@ def repo():
 def poetry(repo):
     p = Poetry.create(Path(__file__).parent.parent / "fixtures" / "simple_project")
 
-    with p.file.path.open() as f:
+    with p.file.path.open(encoding="utf-8") as f:
         content = f.read()
 
     p.pool.remove_repository("pypi")
     p.pool.add_repository(repo)
 
     yield p
 
-    with p.file.path.open("w") as f:
+    with p.file.path.open("w", encoding="utf-8") as f:
         f.write(content)
 
 

tests/repositories/test_legacy_repository.py

@@ -18,7 +18,7 @@ def _get(self, endpoint):
 
         fixture = self.FIXTURES / (name + ".html")
 
-        with fixture.open() as f:
+        with fixture.open(encoding="utf-8") as f:
             return Page(self._url + endpoint, f.read(), {})
 
 

tests/repositories/test_pypi_repository.py

@@ -30,7 +30,7 @@ def _get(self, url):
             if not fixture.exists():
                 fixture = self.JSON_FIXTURES / (name + ".json")
 
-        with fixture.open() as f:
+        with fixture.open(encoding="utf-8") as f:
             return json.loads(f.read())
 
     def _download(self, url, dest):