py2docfx 0.1.15rc2025477__py3-none-any.whl → 0.1.16__py3-none-any.whl

py2docfx/docfx_yaml/process_doctree.py

@@ -111,38 +111,27 @@ def _resolve_reference_in_module_summary(lines):
         new_lines.append(new_line)
     return new_lines
 
-def getParameterArgs(argspec):
+def getParameterArgs(signature):
     args = []
-    for arg in argspec.args:
-        args.append({'id': arg})
-    if argspec.defaults:
-        for count, default in enumerate(argspec.defaults):
-            cut_count = len(argspec.defaults)
-            # Only add defaultValue when str(default) doesn't contain object address string
-            # (object at 0x)(lambda at 0x)(function *** at 0x)
-            # inspect.getargspec method will return wrong defaults which contain object address for some default values, like sys.stdout
-            # Match the defaults with the count
-            if ' at 0x' not in str(default):
-                args[len(args) - cut_count +
-                    count]['defaultValue'] = str(default)
-            else:
-                args[len(args) - cut_count +
-                    count]['isRequired'] = False
+    for param in signature.parameters.values():
+        if param.kind in [param.POSITIONAL_OR_KEYWORD, param.POSITIONAL_ONLY]:
+            arg = {'id': param.name}
+            if param.default is not param.empty:
+                if ' at 0x' not in str(param.default):
+                    arg['defaultValue'] = str(param.default)
+                else:
+                    arg['isRequired'] = False
+            args.append(arg)
     return args
 
-def getKeywordOnlyParameters(argspec):
+def getKeywordOnlyParameters(signature):
     keyword_only_args = []
-    # check if there is keyword only args
-    if argspec.kwonlyargs:
-        count = 0
-        for arg in argspec.kwonlyargs:
-            keyword_only_args.append({'id': arg})
-            # try get the default value for keyword only args
-            if argspec.kwonlydefaults:
-                kwarg_default = argspec.kwonlydefaults.get(arg, None)
-                if kwarg_default:
-                    keyword_only_args[count]['defaultValue'] = str(kwarg_default)
-            count += 1
+    for param in signature.parameters.values():
+        if param.kind == param.KEYWORD_ONLY:
+            kwarg = {'id': param.name}
+            if param.default is not param.empty:
+                kwarg['defaultValue'] = str(param.default)
+            keyword_only_args.append(kwarg)
     return keyword_only_args
 
 def getpositionalOnlyParameters(signature):
@@ -193,13 +182,10 @@ def _create_datam(app, cls, module, name, _type, obj, lines=None):
         if _type in [CLASS, METHOD, FUNCTION]:
             if not (_type  == CLASS and isinstance(type(obj).__call__, type(EnumMeta.__call__))):       
                 signature = inspect.signature(obj)
-                argspec = inspect.getfullargspec(obj)
-
-                args = getParameterArgs(argspec)
-                keyword_only_args = getKeywordOnlyParameters(argspec)
+                args = getParameterArgs(signature)
+                keyword_only_args = getKeywordOnlyParameters(signature)
                 positional_only_params = getpositionalOnlyParameters(signature)
-
-                # The args will contian both regular args and positional only params
+                # The args will contain both regular args and positional only params
                 # so we need to remove the positional only args from params
                 if positional_only_params:
                     args = removePositonalOnlyFromArgs(args, positional_only_params)
@@ -391,6 +377,7 @@ def process_docstring(app, _type, name, obj, options, lines):
     """
     # Use exception as class
     py2docfx_logger = get_package_logger(__name__)
+
     def check_convert_package_type(obj, _type):
         if _type == MODULE:
             filename = getattr(obj, '__file__', None)

py2docfx/docfx_yaml/tests/test_method_arguments.py

@@ -1,24 +1,18 @@
 import pytest
-
-from sphinx.testing import restructuredtext
-from sphinx.io import SphinxStandaloneReader
-from sphinx import addnodes
 from translator import translator
+from .utils.test_utils import prepare_app_envs, load_rst_transform_to_doctree, do_autodoc
 
-from .utils.test_utils import prepare_app_envs,prepare_refered_objects,load_rst_transform_to_doctree, do_autodoc
 @pytest.mark.sphinx('dummy', testroot='method-arguments')
 def test_method_with_three_type_of_arguments(app):
     # Test data definition
     objectToGenXml = 'code_with_all_arg_types.TestClass'
     objectToGenXmlType = 'class'
-
     # Arrange
     prepare_app_envs(app, objectToGenXml)
     doctree = load_rst_transform_to_doctree(app, objectToGenXmlType, objectToGenXml)
     
     # Act
     translator(app, '', doctree)
-
     # Assert
     argumentsDetail = app.env.docfx_yaml_classes[objectToGenXml][1]['syntax']
     parameters = argumentsDetail.get('parameters', None)

py2docfx/docfx_yaml/tests/test_process_doctree.py

@@ -0,0 +1,120 @@
+import pytest
+import inspect
+from sphinx.config import Config
+from docfx_yaml.process_doctree import (
+    getParameterArgs,
+    getKeywordOnlyParameters
+)
+from unittest.mock import Mock
+from docfx_yaml.process_doctree import process_docstring
+from sphinx.config import ENUM
+
+# Test data for getParameterArgs
+@pytest.mark.parametrize("func, expected_args", [
+    (lambda a, b=2, *, c=3, d=4: None, [
+        {'id': 'a', 'isRequired': True},
+        {'id': 'b', 'defaultValue': '2'}
+    ]),
+    (lambda x, y, z=5: None, [
+        {'id': 'x', 'isRequired': True},
+        {'id': 'y', 'isRequired': True},
+        {'id': 'z', 'defaultValue': '5'}
+    ])
+])
+def test_getParameterArgs(func, expected_args):
+    signature = inspect.signature(func)
+    args = getParameterArgs(signature)
+    assert args == expected_args
+
+# Test data for getKeywordOnlyParameters
+@pytest.mark.parametrize("func, expected_kwonlyargs", [
+    (lambda a, b=2, *, c=3, d=4: None, [
+        {'id': 'c', 'defaultValue': '3'},
+        {'id': 'd', 'defaultValue': '4'}
+    ]),
+    (lambda x, y, *, z=5: None, [
+        {'id': 'z', 'defaultValue': '5'}
+    ])
+])
+def test_getKeywordOnlyParameters(func, expected_kwonlyargs):
+    signature = inspect.signature(func)
+    kwonlyargs = getKeywordOnlyParameters(signature)
+    assert kwonlyargs == expected_kwonlyargs
+
+
+@pytest.fixture
+def app():
+    app = Mock()
+    app.config = Config()
+    app.config.autoclass_content = 'both'
+    app.config.autodoc_functions = True
+    app.env = Mock()
+    app.env.docfx_yaml_packages = {}
+    app.env.docfx_yaml_modules = {}
+    app.env.docfx_yaml_classes = {}
+    app.env.docfx_yaml_functions = {}
+    app.env.docfx_info_uid_types = {}
+    return app
+
+
+def test_process_docstring_class(app):
+    class DummyClass:
+        """This is a dummy class."""
+        def method(self):
+            pass
+
+    process_docstring(app, 'class', 'test_module.DummyClass', DummyClass, {}, [])
+
+    assert 'test_module.DummyClass' in app.env.docfx_yaml_classes
+    assert len(app.env.docfx_yaml_classes['test_module.DummyClass']) == 1
+    datam = app.env.docfx_yaml_classes['test_module.DummyClass'][0]
+    assert datam['type'] == 'class'
+    assert datam['name'] == 'DummyClass'
+    assert datam['fullName'] == 'test_module.DummyClass'
+
+
+def test_process_docstring_function(app):
+    def dummy_function():
+        """This is a dummy function."""
+        pass
+
+    process_docstring(app, 'function', 'test_module.dummy_function', dummy_function, {}, [])
+
+    assert 'test_module.dummy_function' in app.env.docfx_yaml_functions
+    assert len(app.env.docfx_yaml_functions['test_module.dummy_function']) == 1
+    datam = app.env.docfx_yaml_functions['test_module.dummy_function'][0]
+    assert datam['type'] == 'function'
+    assert datam['name'] == 'dummy_function'
+    assert datam['fullName'] == 'test_module.dummy_function'
+
+
+def test_process_docstring_decorated_method(app):
+    class DecoratedClass:
+        """This is a decorated class."""
+        @staticmethod
+        def decorated_method(a, b=2, *, c=3):
+            """This is a decorated method."""
+            pass
+
+    process_docstring(app, 'class', 'test_module.DecoratedClass', DecoratedClass, {}, [])
+
+    assert 'test_module.DecoratedClass' in app.env.docfx_yaml_classes
+    assert len(app.env.docfx_yaml_classes['test_module.DecoratedClass']) == 1
+    datam = app.env.docfx_yaml_classes['test_module.DecoratedClass'][0]
+    assert datam['type'] == 'class'
+    assert datam['name'] == 'DecoratedClass'
+    assert datam['fullName'] == 'test_module.DecoratedClass'
+
+    process_docstring(app, 'method', 'test_module.DecoratedClass.decorated_method', DecoratedClass.decorated_method, {}, [])
+
+    method_syntax_list = [m for m in app.env.docfx_yaml_classes['test_module.DecoratedClass'] if m['name'] == 'decorated_method']
+    assert len(method_syntax_list) == 1
+    method_syntax = method_syntax_list[0]['syntax']
+    assert method_syntax['parameters'] == [
+        {'id': 'a', 'isRequired': True},
+        {'id': 'b', 'defaultValue': '2'}
+    ]
+    assert method_syntax['keywordOnlyParameters'] == [
+        {'id': 'c', 'defaultValue': '3'}
+    ]
+    assert 'positionalOnlyParameters' not in method_syntax

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_core_metadata.py

@@ -28,7 +28,7 @@ from distutils.util import rfc822_escape
 def get_metadata_version(self):
     mv = getattr(self, 'metadata_version', None)
     if mv is None:
-        mv = Version('2.2')
+        mv = Version('2.4')
         self.metadata_version = mv
     return mv
 
@@ -88,6 +88,7 @@ def read_pkg_file(self, file):
     self.url = _read_field_from_msg(msg, 'home-page')
     self.download_url = _read_field_from_msg(msg, 'download-url')
     self.license = _read_field_unescaped_from_msg(msg, 'license')
+    self.license_expression = _read_field_unescaped_from_msg(msg, 'license-expression')
 
     self.long_description = _read_field_unescaped_from_msg(msg, 'description')
     if self.long_description is None and self.metadata_version >= Version('2.1'):
@@ -175,8 +176,9 @@ def write_pkg_file(self, file):  # noqa: C901  # is too complex (14)  # FIXME
         if attr_val is not None:
             write_field(field, attr_val)
 
-    license = self.get_license()
-    if license:
+    if license_expression := self.license_expression:
+        write_field('License-Expression', license_expression)
+    elif license := self.get_license():
         write_field('License', rfc822_escape(license))
 
     for label, url in self.project_urls.items():
@@ -205,7 +207,8 @@ def write_pkg_file(self, file):  # noqa: C901  # is too complex (14)  # FIXME
     if self.long_description_content_type:
         write_field('Description-Content-Type', self.long_description_content_type)
 
-    self._write_list(file, 'License-File', self.license_files or [])
+    safe_license_files = map(_safe_license_file, self.license_files or [])
+    self._write_list(file, 'License-File', safe_license_files)
     _write_requirements(self, file)
 
     for field, attr in _POSSIBLE_DYNAMIC_FIELDS.items():
@@ -291,6 +294,14 @@ def _distribution_fullname(name: str, version: str) -> str:
     )
 
 
+def _safe_license_file(file):
+    # XXX: Do we need this after the deprecation discussed in #4892, #4896??
+    normalized = os.path.normpath(file).replace(os.sep, "/")
+    if "../" in normalized:
+        return os.path.basename(normalized)  # Temporarily restore pre PEP639 behaviour
+    return normalized
+
+
 _POSSIBLE_DYNAMIC_FIELDS = {
     # Core Metadata Field x related Distribution attribute
     "author": "author",
@@ -302,7 +313,12 @@ _POSSIBLE_DYNAMIC_FIELDS = {
     "home-page": "url",
     "keywords": "keywords",
     "license": "license",
-    # "license-file": "license_files", # XXX: does PEP 639 exempt Dynamic ??
+    # XXX: License-File is complicated because the user gives globs that are expanded
+    #      during the build. Without special handling it is likely always
+    #      marked as Dynamic, which is an acceptable outcome according to:
+    #      https://github.com/pypa/setuptools/issues/4629#issuecomment-2331233677
+    "license-file": "license_files",
+    "license-expression": "license_expression",  # PEP 639
     "maintainer": "maintainer",
     "maintainer-email": "maintainer_email",
     "obsoletes": "obsoletes",

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/_msvccompiler.py

@@ -1,3 +1,16 @@
+import warnings
+
 from .compilers.C import msvc
 
+__all__ = ["MSVCCompiler"]
+
 MSVCCompiler = msvc.Compiler
+
+
+def __getattr__(name):
+    if name == '_get_vc_env':
+        warnings.warn(
+            "_get_vc_env is private; find an alternative (pypa/distutils#340)"
+        )
+        return msvc._get_vc_env
+    raise AttributeError(name)

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/ccompiler.py

@@ -1,13 +1,16 @@
+from .compat.numpy import (  # noqa: F401
+    _default_compilers,
+    compiler_class,
+)
 from .compilers.C import base
 from .compilers.C.base import (
-    CompileError,
-    LinkError,
     gen_lib_options,
     gen_preprocess_options,
     get_default_compiler,
     new_compiler,
     show_compilers,
 )
+from .compilers.C.errors import CompileError, LinkError
 
 __all__ = [
     'CompileError',

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build.py

@@ -10,17 +10,12 @@ import sysconfig
 from collections.abc import Callable
 from typing import ClassVar
 
+from ..ccompiler import show_compilers
 from ..core import Command
 from ..errors import DistutilsOptionError
 from ..util import get_platform
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build(Command):
     description = "build everything needed to install"
 

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_clib.py

@@ -19,17 +19,12 @@ from collections.abc import Callable
 from distutils._log import log
 from typing import ClassVar
 
+from ..ccompiler import new_compiler, show_compilers
 from ..core import Command
 from ..errors import DistutilsSetupError
 from ..sysconfig import customize_compiler
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build_clib(Command):
     description = "build C/C++ libraries used by Python extensions"
 
@@ -93,9 +88,6 @@ class build_clib(Command):
         if not self.libraries:
             return
 
-        # Yech -- this is cut 'n pasted from build_ext.py!
-        from ..ccompiler import new_compiler
-
         self.compiler = new_compiler(
             compiler=self.compiler, dry_run=self.dry_run, force=self.force
         )

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_ext.py

@@ -16,6 +16,7 @@ from site import USER_BASE
 from typing import ClassVar
 
 from .._modified import newer_group
+from ..ccompiler import new_compiler, show_compilers
 from ..core import Command
 from ..errors import (
     CCompilerError,
@@ -34,12 +35,6 @@ from ..util import get_platform, is_freethreaded, is_mingw
 extension_name_re = re.compile(r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$')
 
 
-def show_compilers():
-    from ..ccompiler import show_compilers
-
-    show_compilers()
-
-
 class build_ext(Command):
     description = "build C/C++ extensions (compile/link to build directory)"
 
@@ -303,8 +298,6 @@ class build_ext(Command):
                 raise DistutilsOptionError("parallel should be an integer")
 
     def run(self) -> None:  # noqa: C901
-        from ..ccompiler import new_compiler
-
         # 'self.extensions', as supplied by setup.py, is a list of
         # Extension instances.  See the documentation for Extension (in
         # distutils.extension) for details.

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/check.py

@@ -141,7 +141,7 @@ class check(Command):
         document.note_source(source_path, -1)
         try:
             parser.parse(data, document)
-        except AttributeError as e:
+        except (AttributeError, TypeError) as e:
             reporter.messages.append((
                 -1,
                 f'Could not finish the parsing: {e}.',

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/config.py

@@ -258,8 +258,6 @@ class config(Command):
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.
         """
-        from ..ccompiler import CompileError, LinkError
-
         self._check_compiler()
         try:
             src, obj, exe = self._link(

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install.py

@@ -4,6 +4,7 @@ Implements the Distutils 'install' command."""
 
 from __future__ import annotations
 
+import collections
 import contextlib
 import itertools
 import os
@@ -13,8 +14,6 @@ from distutils._log import log
 from site import USER_BASE, USER_SITE
 from typing import ClassVar
 
-import jaraco.collections
-
 from ..core import Command
 from ..debug import DEBUG
 from ..errors import DistutilsOptionError, DistutilsPlatformError
@@ -145,7 +144,7 @@ def _resolve_scheme(name):
     try:
         resolved = sysconfig.get_preferred_scheme(key)
     except Exception:
-        resolved = fw.scheme(_pypy_hack(name))
+        resolved = fw.scheme(name)
     return resolved
 
 
@@ -162,7 +161,7 @@ def _inject_headers(name, scheme):
     """
     # Bypass the preferred scheme, which may not
     # have defined headers.
-    fallback = _load_scheme(_pypy_hack(name))
+    fallback = _load_scheme(name)
     scheme.setdefault('headers', fallback['headers'])
     return scheme
 
@@ -172,14 +171,6 @@ def _scheme_attrs(scheme):
     return {f'install_{key}': scheme[key] for key in SCHEME_KEYS}
 
 
-def _pypy_hack(name):
-    PY37 = sys.version_info < (3, 8)
-    old_pypy = hasattr(sys, 'pypy_version_info') and PY37
-    prefix = not name.endswith(('_user', '_home'))
-    pypy_name = 'pypy' + '_nt' * (os.name == 'nt')
-    return pypy_name if old_pypy and prefix else name
-
-
 class install(Command):
     description = "install everything from build directory"
 
@@ -432,12 +423,12 @@ class install(Command):
             local_vars['userbase'] = self.install_userbase
             local_vars['usersite'] = self.install_usersite
 
-        self.config_vars = jaraco.collections.DictStack([
-            fw.vars(),
-            compat_vars,
-            sysconfig.get_config_vars(),
+        self.config_vars = collections.ChainMap(
             local_vars,
-        ])
+            sysconfig.get_config_vars(),
+            compat_vars,
+            fw.vars(),
+        )
 
         self.expand_basedirs()
 

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compat/numpy.py

@@ -0,0 +1,2 @@
+# required for older numpy versions on Pythons prior to 3.12; see pypa/setuptools#4876
+from ..compilers.C.base import _default_compilers, compiler_class  # noqa: F401

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/base.py

@@ -120,12 +120,12 @@ class Compiler:
     }
     language_order: ClassVar[list[str]] = ["c++", "objc", "c"]
 
-    include_dirs = []
+    include_dirs: list[str] = []
     """
     include dirs specific to this compiler class
     """
 
-    library_dirs = []
+    library_dirs: list[str] = []
     """
     library dirs specific to this compiler class
     """
@@ -148,14 +148,14 @@ class Compiler:
         self.macros: list[_Macro] = []
 
         # 'include_dirs': a list of directories to search for include files
-        self.include_dirs: list[str] = []
+        self.include_dirs = []
 
         # 'libraries': a list of libraries to include in any link
         # (library names, not filenames: eg. "foo" not "libfoo.a")
         self.libraries: list[str] = []
 
         # 'library_dirs': a list of directories to search for libraries
-        self.library_dirs: list[str] = []
+        self.library_dirs = []
 
         # 'runtime_library_dirs': a list of directories to search for
         # shared libraries/objects at runtime
@@ -236,8 +236,11 @@ class Compiler:
     def _is_valid_macro(name, value=None):
         """
         A valid macro is a ``name : str`` and a ``value : str | None``.
+
+        >>> Compiler._is_valid_macro('foo', None)
+        True
         """
-        return isinstance(name, str) and isinstance(value, (str, None))
+        return isinstance(name, str) and isinstance(value, (str, type(None)))
 
     # -- Bookkeeping methods -------------------------------------------
 

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/msvc.py

@@ -257,7 +257,7 @@ class Compiler(base.Compiler):
     obj_extension = '.obj'
     static_lib_extension = '.lib'
     shared_lib_extension = '.dll'
-    static_lib_format = static_lib_format = '%s%s'
+    static_lib_format = shared_lib_format = '%s%s'
     exe_extension = '.exe'
 
     def __init__(self, verbose=False, dry_run=False, force=False) -> None:

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/unix.py

@@ -158,6 +158,20 @@ class Compiler(base.Compiler):
         dylib_lib_extension = ".dll"
         dylib_lib_format = "cyg%s%s"
 
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
+        """Remove standard library path from rpath"""
+        libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
+            libraries, library_dirs, runtime_library_dirs
+        )
+        libdir = sysconfig.get_config_var('LIBDIR')
+        if (
+            runtime_library_dirs
+            and libdir.startswith("/usr/lib")
+            and (libdir in runtime_library_dirs)
+        ):
+            runtime_library_dirs.remove(libdir)
+        return libraries, library_dirs, runtime_library_dirs
+
     def preprocess(
         self,
         source: str | os.PathLike[str],
@@ -309,7 +323,7 @@ class Compiler(base.Compiler):
         compiler = os.path.basename(shlex.split(cc_var)[0])
         return "gcc" in compiler or "g++" in compiler
 
-    def runtime_library_dir_option(self, dir: str) -> str | list[str]:
+    def runtime_library_dir_option(self, dir: str) -> str | list[str]:  # type: ignore[override] # Fixed in pypa/distutils#339
         # XXX Hackish, at the very least.  See Python bug #445902:
         # https://bugs.python.org/issue445902
         # Linkers on different platforms need different options to

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/dist.py

@@ -183,7 +183,7 @@ Common commands: (see '--help-commands' for more)
         # can 1) quickly figure out which class to instantiate when
         # we need to create a new command object, and 2) have a way
         # for the setup script to override command classes
-        self.cmdclass = {}
+        self.cmdclass: dict[str, type[Command]] = {}
 
         # 'command_packages' is a list of packages in which commands
         # are searched for.  The factory for command 'foo' is expected
@@ -1168,6 +1168,7 @@ class DistributionMetadata:
             value = msg[name]
             if value and value != "UNKNOWN":
                 return value
+            return None
 
         def _read_list(name):
             values = msg.get_all(name, None)

py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/sysconfig.py

@@ -156,8 +156,6 @@ def _extant(path):
 
 
 def _get_python_inc_posix(prefix, spec_prefix, plat_specific):
-    if IS_PYPY and sys.version_info < (3, 8):
-        return os.path.join(prefix, 'include')
     return (
         _get_python_inc_posix_python(plat_specific)
         or _extant(_get_python_inc_from_config(plat_specific, spec_prefix))
@@ -246,14 +244,6 @@ def get_python_lib(
     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
     """
 
-    if IS_PYPY and sys.version_info < (3, 8):
-        # PyPy-specific schema
-        if prefix is None:
-            prefix = PREFIX
-        if standard_lib:
-            return os.path.join(prefix, "lib-python", sys.version_info.major)
-        return os.path.join(prefix, 'site-packages')
-
     early_prefix = prefix
 
     if prefix is None: