👽 Migrate to toml and apply isort to pythonpackage.py

Because `pytoml` is deprecated

See also: https://pypi.org/project/pytoml/

Author: opacam

pythonforandroid/pythonpackage.py

@@ -33,26 +33,23 @@
 """
 
 
-from io import open  # needed for python 2
 import functools
 import os
-from pep517.envbuild import BuildEnvironment
-from pep517.wrappers import Pep517HookCaller
-import pytoml
 import shutil
 import subprocess
 import sys
 import tarfile
 import tempfile
 import textwrap
 import time
-try:
-    from urllib.parse import urlparse
-    from urllib.parse import unquote as urlunquote
-except ImportError:  # Python 2...
-    from urlparse import urlparse
-    from urlparse import unquote as urlunquote
 import zipfile
+from io import open  # needed for python 2
+from urllib.parse import unquote as urlunquote
+from urllib.parse import urlparse
+
+import toml
+from pep517.envbuild import BuildEnvironment
+from pep517.wrappers import Pep517HookCaller
 
 
 def transform_dep_for_pip(dependency):
@@ -486,7 +483,7 @@ def _extract_metainfo_files_from_package_unsafe(
 
             # Get build backend and requirements from pyproject.toml:
             with open(os.path.join(path, 'pyproject.toml')) as f:
-                build_sys = pytoml.load(f)['build-system']
+                build_sys = toml.load(f)['build-system']
                 backend = build_sys["build-backend"]
                 build_requires.extend(build_sys["requires"])
 
@@ -630,7 +627,7 @@ def _extract_info_from_package(dependency,
                               ) and include_build_requirements:
                 # Read build system from pyproject.toml file: (PEP518)
                 with open(os.path.join(output_folder, 'pyproject.toml')) as f:
-                    build_sys = pytoml.load(f)['build-system']
+                    build_sys = toml.load(f)['build-system']
                     if "requires" in build_sys:
                         requirements += build_sys["requires"]
             elif include_build_requirements:

setup.py

@@ -23,7 +23,7 @@
 install_reqs = [
     'appdirs', 'colorama>=0.3.3', 'jinja2', 'six',
     'enum34; python_version<"3.4"', 'sh>=1.10; sys_platform!="nt"',
-    'pep517<0.7.0"', 'pytoml', 'virtualenv<20'
+    'pep517<0.7.0"', 'toml', 'virtualenv<20'
 ]
 # (pep517, pytoml and virtualenv are used by pythonpackage.py)
 

tests/test_pythonpackage_basic.py

@@ -340,6 +340,10 @@ def test_venv(self):
                 os.path.join(test_dir, "venv", "bin", "pip"),
                 "install", "-U", "pep517<0.7.0"
             ])
+            subprocess.check_output([
+                os.path.join(test_dir, "venv", "bin", "pip"),
+                "install", "-U", "toml"
+            ])
             sys_python_path = self.run__get_system_python_executable(
                 os.path.join(test_dir, "venv", "bin", "python")
             )