py2docfx 0.1.10.dev1819897__py3-none-any.whl → 0.1.10.dev1824234__py3-none-any.whl

py2docfx/__main__.py

@@ -231,12 +231,13 @@ def donwload_package_generate_documents(
         output_doc_folder: os.PathLike | None,
         github_token: str, ado_token: str):
 
+    start_time = time.time()
     venv_manager = VirtualEnvironmentManager(package_info_list, required_package_list, github_token, ado_token)
     template_venv_id = "template"
     template_venv_path = venv_manager.create_template_venv(template_venv_id)
-
+    end_time = time.time()
+    print(f"<create_template_venv>{template_venv_id},{end_time-start_time}<create_template_venv/>")
     def initial_venv_cache():
-        start_time = time.time()
         package_count = len(package_info_list)
         cache_cout = CACHED_VIRTUALENV_LENGTH
         if package_count < CACHED_VIRTUALENV_LENGTH:
@@ -251,8 +252,6 @@ def donwload_package_generate_documents(
 
         for thread in threads:
             thread.join()
-        end_time = time.time()
-        print(f"<initial_venv_cache>{end_time - start_time}<initial_venv_cache/>")
 
     def donwload_one_package_generate_document(
             package: PackageInfo,
@@ -287,7 +286,10 @@ def donwload_package_generate_documents(
             package.path.move_document_to_target(os.path.join(output_doc_folder, package.name))
 
     # Cache virtual environments
+    start_time = time.time()
     initial_venv_cache()
+    end_time = time.time()
+    print(f"<initial_venv_cache>{end_time - start_time}<initial_venv_cache/>")
 
     for package_index, package in enumerate(package_info_list):
         worker_venv_id = str(package_index)
@@ -317,7 +319,10 @@ def donwload_package_generate_documents(
             thread.join()
 
     if output_doc_folder:
+        start_time = time.time()
         move_root_toc_to_target(YAML_OUTPUT_ROOT, output_doc_folder)
+        end_time = time.time()
+        print(f"<move_root_toc_to_target>{end_time-start_time}<move_root_toc_to_target/>")
 
 def prepare_out_dir(output_root: str | os.PathLike) -> os.PathLike | None:
     # prepare output_root\DOC_FOLDER_NAME (if folder contains files, raise exception)

py2docfx/convert_prepare/environment.py

@@ -49,7 +49,6 @@ class VirtualEnvironmentManager:
                 install_package(package, executable)
 
     def create_template_venv(self, venv_name: str) -> str:
-        start_time = time.time()
         venv_dir = os.path.join(PACKAGE_ROOT, "venv", venv_name)
 
         try:
@@ -59,10 +58,13 @@ class VirtualEnvironmentManager:
 
         if os.name == "nt":
             env_executable = os.path.join(venv_dir, "Scripts", "python.exe")
-
+        start_time = time.time()
         install_converter_requirements(env_executable)
+        end_time = time.time()
+        print(f"<install_converter_requirements>{venv_name},{end_time-start_time}<install_converter_requirements/>")
         if (self.required_package_list is not None) and (len(self.required_package_list) > 0):
+            start_time = time.time()
             self.install_required_packages(env_executable)
-        end_time = time.time()
-        print(f"<create_template_venv>{venv_name},{end_time-start_time}<create_template_venv/>")
+            end_time = time.time()
+            print(f"<install_required_packages>{venv_name},{end_time-start_time}<install_required_packages/>")
         return venv_dir

py2docfx/convert_prepare/generate_document.py

@@ -1,5 +1,6 @@
 from __future__ import annotations # Avoid A | B annotation break under <= py3.9
 import os
+import time
 from py2docfx.convert_prepare.generate_conf import generate_conf
 from py2docfx.convert_prepare.git import checkout
 from py2docfx.convert_prepare.package_info import PackageInfo
@@ -9,6 +10,7 @@ from py2docfx.convert_prepare.subpackage import merge_subpackage_files
 CONF_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "conf_templates")
 
 def generate_document(pkg: PackageInfo, output_root: str | os.PathLike, executable: str):
+    start_time = time.time()
     # Copy manual written RST from target doc repo
     package_paths = pkg.path
     if output_root:
@@ -36,11 +38,19 @@ def generate_document(pkg: PackageInfo, output_root: str | os.PathLike, executab
         print(rst_file)
 
     print("<CI INFO>: Running Sphinx build...")
+    end_time = time.time()
+    print(f"<pre_generate_conf>{pkg.name},{end_time-start_time}<pre_generate_conf/>")
+    start_time = time.time()
     generate_conf(pkg, package_paths.doc_folder, CONF_TEMPLATE_DIR)
+    end_time = time.time()
+    print(f"<generate_conf>{pkg.name},{end_time-start_time}<generate_conf/>")
+    start_time = time.time()
     run_converter(package_paths.doc_folder, package_paths.yaml_output_folder, executable)
-
+    end_time = time.time()
+    print(f"<run_converter>{pkg.name},{end_time-start_time}<run_converter/>")
     subpackages_path_record = {}
     if pkg.build_in_subpackage:
+        start_time = time.time()
         subpackages_yaml_path = os.path.join(package_paths.yaml_output_folder, "subpackages")
         for (subpackage_name, subpackage_path) in subpackages_rst_record.items():
             subpackage_yaml_path = os.path.join(subpackages_yaml_path, subpackage_name)
@@ -48,3 +58,5 @@ def generate_document(pkg: PackageInfo, output_root: str | os.PathLike, executab
             run_converter(subpackage_path, subpackage_yaml_path, executable)
 
         merge_subpackage_files(subpackages_path_record, package_paths.yaml_output_folder, pkg.name)
+        end_time = time.time()
+        print(f"<merge_subpackage_files>{pkg.name},{end_time-start_time}<merge_subpackage_files/>")

py2docfx/convert_prepare/get_source.py

@@ -2,6 +2,7 @@ import os.path as path
 import os
 import subprocess
 import sys
+import time
 
 import py2docfx.convert_prepare.git as git
 import py2docfx.convert_prepare.pip_utils as pip_utils
@@ -75,6 +76,7 @@ def get_source(pkg: PackageInfo, cnt: int, executable: str, vststoken=None, gith
     dist_dir = path.join("dist_temp", path_cnt)
 
     if pkg.install_type == PackageInfo.InstallType.SOURCE_CODE:
+        start_time = time.time()
         if pkg.url:
             repo_folder = path.join("source_repo", path_cnt)
             token = githubtoken if "github.com" in pkg.url else vststoken
@@ -89,8 +91,10 @@ def get_source(pkg: PackageInfo, cnt: int, executable: str, vststoken=None, gith
         else:
             source_folder = pkg.folder
             sys.path.insert(0, source_folder)
-
+        end_time = time.time()
+        print(f"<download_source>{pkg.name},{end_time-start_time}<download_source/>")
     elif pkg.install_type == PackageInfo.InstallType.PYPI:
+        start_time = time.time()
         full_name = pkg.get_combined_name_version()
         pip_utils.download(
             full_name,
@@ -99,7 +103,9 @@ def get_source(pkg: PackageInfo, cnt: int, executable: str, vststoken=None, gith
             extra_index_url=pkg.extra_index_url,
             prefer_source_distribution=pkg.prefer_source_distribution,
         )
-
+        end_time = time.time()
+        print(f"<download_pypi>{pkg.name},{end_time-start_time}<download_pypi/>")
+        start_time = time.time()
         # unpack the downloaded wheel file.
         downloaded_dist_file = path.join(dist_dir, os.listdir(dist_dir)[0])
         pack.unpack_dist(downloaded_dist_file)
@@ -108,9 +114,14 @@ def get_source(pkg: PackageInfo, cnt: int, executable: str, vststoken=None, gith
             path.dirname(downloaded_dist_file),
             os.listdir(dist_dir)[0]
         )
+        end_time = time.time()
+        print(f"<unpack_pypi>{pkg.name},{end_time-start_time}<unpack_pypi/>")
     elif pkg.install_type == PackageInfo.InstallType.DIST_FILE:
+        start_time = time.time()
         pip_utils.download(pkg.location, dist_dir, executable, prefer_source_distribution=False)
-
+        end_time = time.time()
+        print(f"<download_dist>{pkg.name},{end_time-start_time}<download_dist/>")
+        start_time = time.time()
         # unpack the downloaded dist file.
         downloaded_dist_file = path.join(dist_dir, os.listdir(dist_dir)[0])
         pack.unpack_dist(downloaded_dist_file)
@@ -122,7 +133,11 @@ def get_source(pkg: PackageInfo, cnt: int, executable: str, vststoken=None, gith
             path.dirname(downloaded_dist_file),
             os.listdir(dist_dir)[0]
         )
+        end_time = time.time()
+        print(f"<unpack_dist>{pkg.name},{end_time-start_time}<unpack_dist/>")
     else:
         raise ValueError(f"Unknown install type: {pkg.install_type}")
-
+    start_time = time.time()
     update_package_info(pkg, source_folder, executable)
+    end_time = time.time()
+    print(f"<update_package_info>{pkg.name},{end_time-start_time}<update_package_info/>")

py2docfx/convert_prepare/package_info.py

@@ -32,7 +32,7 @@ class PackageInfo:
         package_info = PackageInfo()
         package_info.exclude_path = dict.get("exclude_path", [])
         package_info.extension_config = dict.get("extension_config", {})
-        package_info.sphinx_extensions = dict.get("sphinx_extensions", [])
+
         if reading_required_packages:
             package_info_dict = dict
         else:

py2docfx/convert_prepare/pip_utils.py

@@ -1,5 +1,4 @@
 import subprocess
-import sys
 from py2docfx import PACKAGE_ROOT
 PYPI = "pypi"
 

py2docfx/convert_prepare/sphinx_caller.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import time
 from sphinx.application import Sphinx
 import sphinx.ext.apidoc as apidoc
 import sphinx.cmd.build
@@ -95,5 +96,8 @@ def run_converter(rst_path, out_path, executable, conf_path = None):
             env_tmp["PYTHONPATH"] = f"{package_root_parent};{python_path_current}" if python_path_current else package_root_parent
         else:
             env_tmp["PYTHONPATH"] = f"{package_root_parent}:{python_path_current}" if python_path_current else package_root_parent
+        start_time = time.time()
         subprocess.run(sphinx_param, check=True, cwd=PACKAGE_ROOT, env=env_tmp)
+        end_time = time.time()
+        print(f"<run_sphinx>{out_path},{end_time-start_time}<run_sphinx/>")
     return outdir

py2docfx/convert_prepare/tests/test_package_info.py

@@ -17,8 +17,6 @@ package_info_1 = PackageInfo.parse_from(test_dict["packages"][1], False)
 
 package_info_2 = PackageInfo.parse_from(test_dict["packages"][2], False)
 
-package_info_3 = PackageInfo.parse_from(test_dict["packages"][3], False)
-
 def test_parse_from():
     assert package_info_0.exclude_path == ["test*", "example*", "sample*", "doc*"]
     assert package_info_0.name == "azure-mltable-py2docfxtest"
@@ -28,11 +26,6 @@ def test_get_combined_name_version():
     name_version = package_info_1.get_combined_name_version()
     assert name_version == "azureml-accel-models==1.0.0"
 
-def test_get_sphinx_extensions():
-    assert package_info_3.sphinx_extensions == ["sphinx-pydantic"]
-    assert package_info_3.name == "semantic-kernel"
-    assert package_info_3.install_type.name == "PYPI"
-
 def test_intall_command():
     install_command = package_info_0.get_install_command()
     assert install_command[0] == "azure-mltable-py2docfxtest"
@@ -42,6 +35,28 @@ def test_intall_command():
     assert install_command[0] == "azureml-accel-models==1.0.0"
     assert install_command[1] == []
 
+def test_get_exclude_command(tmp_path):
+    source_folder = os.path.join(tmp_path,"source_folder")
+    yaml_output_folder = os.path.join(tmp_path,"yaml_output_folder")
+    package_info_0.path = Source(
+        source_folder = source_folder, yaml_output_folder = yaml_output_folder, package_name = "azure-mltable-py2docfxtest"
+    )
+    exclude_path = package_info_0.get_exluded_command()
+    expected_exclude_path = [
+        "build/*",
+        "setup.py",
+        "test*",
+        "example*",
+        "sample*",
+        "doc*",
+        "azure/__init__.py",
+        "azure/mltable/__init__.py"
+    ]
+    def form_exclude_path(raletive_path):
+        return os.path.join(source_folder, raletive_path)
+    assert exclude_path == [form_exclude_path(path) for path in expected_exclude_path]
+
+
 def test_get_exclude_command(tmp_path):
     source_folder = os.path.join(tmp_path,"source_folder")
     yaml_output_folder = os.path.join(tmp_path,"yaml_output_folder")

py2docfx/convert_prepare/tests/test_params.py

@@ -21,11 +21,6 @@ def package_info_assert(package_info_list, required_package_info_list):
     assert package.install_type.name == "PYPI"
     assert package.exclude_path == []
 
-    package = package_info_list[3]
-    assert package.name == "semantic-kernel"
-    assert package.install_type.name == "PYPI"
-    assert package.sphinx_extensions == ["sphinx-pydantic"]
-
     required_package = required_package_info_list[0]
     assert required_package.name == None
     assert required_package.install_type.name == "DIST_FILE"

py2docfx/venv/0/Lib/site-packages/babel/__init__.py

@@ -25,7 +25,7 @@ from babel.core import (
     parse_locale,
 )
 
-__version__ = '2.15.0'
+__version__ = '2.16.0'
 
 __all__ = [
     'Locale',

py2docfx/venv/0/Lib/site-packages/babel/core.py

@@ -201,7 +201,11 @@ class Locale:
 
         identifier = str(self)
         identifier_without_modifier = identifier.partition('@')[0]
-        if not localedata.exists(identifier_without_modifier):
+        if localedata.exists(identifier):
+            self.__data_identifier = identifier
+        elif localedata.exists(identifier_without_modifier):
+            self.__data_identifier = identifier_without_modifier
+        else:
             raise UnknownLocaleError(identifier)
 
     @classmethod
@@ -436,7 +440,7 @@ class Locale:
     @property
     def _data(self) -> localedata.LocaleDataDict:
         if self.__data is None:
-            self.__data = localedata.LocaleDataDict(localedata.load(str(self)))
+            self.__data = localedata.LocaleDataDict(localedata.load(self.__data_identifier))
         return self.__data
 
     def get_display_name(self, locale: Locale | str | None = None) -> str | None:

py2docfx/venv/0/Lib/site-packages/babel/dates.py

@@ -826,6 +826,10 @@ def format_skeleton(
     Traceback (most recent call last):
         ...
     KeyError: yMMd
+    >>> format_skeleton('GH', t, fuzzy=True, locale='fi_FI')  # GH is not in the Finnish locale and there is no close match, an error is thrown
+    Traceback (most recent call last):
+        ...
+    KeyError: None
 
     After the skeleton is resolved to a pattern `format_datetime` is called so
     all timezone processing etc is the same as for that.
@@ -835,7 +839,8 @@ def format_skeleton(
                  time in UTC is used
     :param tzinfo: the time-zone to apply to the time for display
     :param fuzzy: If the skeleton is not found, allow choosing a skeleton that's
-                  close enough to it.
+                  close enough to it. If there is no close match, a `KeyError`
+                  is thrown.
     :param locale: a `Locale` object or a locale identifier
     """
     locale = Locale.parse(locale)

py2docfx/venv/0/Lib/site-packages/babel/lists.py

@@ -26,9 +26,11 @@ if TYPE_CHECKING:
 DEFAULT_LOCALE = default_locale()
 
 
-def format_list(lst: Sequence[str],
-                style: Literal['standard', 'standard-short', 'or', 'or-short', 'unit', 'unit-short', 'unit-narrow'] = 'standard',
-                locale: Locale | str | None = DEFAULT_LOCALE) -> str:
+def format_list(
+    lst: Sequence[str],
+    style: Literal['standard', 'standard-short', 'or', 'or-short', 'unit', 'unit-short', 'unit-narrow'] = 'standard',
+    locale: Locale | str | None = DEFAULT_LOCALE,
+) -> str:
     """
     Format the items in `lst` as a list.
 
@@ -39,7 +41,11 @@ def format_list(lst: Sequence[str],
     >>> format_list(['omena', 'peruna', 'aplari'], style='or', locale='fi')
     u'omena, peruna tai aplari'
 
-    These styles are defined, but not all are necessarily available in all locales.
+    Not all styles are necessarily available in all locales.
+    The function will attempt to fall back to replacement styles according to the rules
+    set forth in the CLDR root XML file, and raise a ValueError if no suitable replacement
+    can be found.
+
     The following text is verbatim from the Unicode TR35-49 spec [1].
 
     * standard:
@@ -76,14 +82,9 @@ def format_list(lst: Sequence[str],
     if len(lst) == 1:
         return lst[0]
 
-    if style not in locale.list_patterns:
-        raise ValueError(
-            f'Locale {locale} does not support list formatting style {style!r} '
-            f'(supported are {sorted(locale.list_patterns)})',
-        )
-    patterns = locale.list_patterns[style]
+    patterns = _resolve_list_style(locale, style)
 
-    if len(lst) == 2:
+    if len(lst) == 2 and '2' in patterns:
         return patterns['2'].format(*lst)
 
     result = patterns['start'].format(lst[0], lst[1])
@@ -92,3 +93,31 @@ def format_list(lst: Sequence[str],
     result = patterns['end'].format(result, lst[-1])
 
     return result
+
+
+# Based on CLDR 45's root.xml file's `<alias>`es.
+# The root file defines both `standard` and `or`,
+# so they're always available.
+# TODO: It would likely be better to use the
+#       babel.localedata.Alias mechanism for this,
+#       but I'm not quite sure how it's supposed to
+#       work with inheritance and data in the root.
+_style_fallbacks = {
+    "or-narrow": ["or-short", "or"],
+    "or-short": ["or"],
+    "standard-narrow": ["standard-short", "standard"],
+    "standard-short": ["standard"],
+    "unit": ["unit-short", "standard"],
+    "unit-narrow": ["unit-short", "unit", "standard"],
+    "unit-short": ["standard"],
+}
+
+
+def _resolve_list_style(locale: Locale, style: str):
+    for style in (style, *(_style_fallbacks.get(style, []))):  # noqa: B020
+        if style in locale.list_patterns:
+            return locale.list_patterns[style]
+    raise ValueError(
+        f"Locale {locale} does not support list formatting style {style!r} "
+        f"(supported are {sorted(locale.list_patterns)})",
+    )

py2docfx/venv/0/Lib/site-packages/babel/localedata.py

@@ -95,6 +95,27 @@ def locale_identifiers() -> list[str]:
     ]
 
 
+def _is_non_likely_script(name: str) -> bool:
+    """Return whether the locale is of the form ``lang_Script``,
+    and the script is not the likely script for the language.
+
+    This implements the behavior of the ``nonlikelyScript`` value of the
+    ``localRules`` attribute for parent locales added in CLDR 45.
+    """
+    from babel.core import get_global, parse_locale
+
+    try:
+        lang, territory, script, variant, *rest = parse_locale(name)
+    except ValueError:
+        return False
+
+    if lang and script and not territory and not variant and not rest:
+        likely_subtag = get_global('likely_subtags').get(lang)
+        _, _, likely_script, *_ = parse_locale(likely_subtag)
+        return script != likely_script
+    return False
+
+
 def load(name: os.PathLike[str] | str, merge_inherited: bool = True) -> dict[str, Any]:
     """Load the locale data for the given locale.
 
@@ -132,8 +153,11 @@ def load(name: os.PathLike[str] | str, merge_inherited: bool = True) -> dict[str
                 from babel.core import get_global
                 parent = get_global('parent_exceptions').get(name)
                 if not parent:
-                    parts = name.split('_')
-                    parent = "root" if len(parts) == 1 else "_".join(parts[:-1])
+                    if _is_non_likely_script(name):
+                        parent = 'root'
+                    else:
+                        parts = name.split('_')
+                        parent = "root" if len(parts) == 1 else "_".join(parts[:-1])
                 data = load(parent).copy()
             filename = resolve_locale_filename(name)
             with open(filename, 'rb') as fileobj:

py2docfx/venv/0/Lib/site-packages/babel/localtime/_helpers.py

@@ -2,7 +2,11 @@ try:
     import pytz
 except ModuleNotFoundError:
     pytz = None
+
+try:
     import zoneinfo
+except ModuleNotFoundError:
+    zoneinfo = None
 
 
 def _get_tzinfo(tzenv: str):
@@ -19,6 +23,16 @@ def _get_tzinfo(tzenv: str):
     else:
         try:
             return zoneinfo.ZoneInfo(tzenv)
+        except ValueError as ve:
+            # This is somewhat hacky, but since _validate_tzfile_path() doesn't
+            # raise a specific error type, we'll need to check the message to be
+            # one we know to be from that function.
+            # If so, we pretend it meant that the TZ didn't exist, for the benefit
+            # of `babel.localtime` catching the `LookupError` raised by
+            # `_get_tzinfo_or_raise()`.
+            # See https://github.com/python-babel/babel/issues/1092
+            if str(ve).startswith("ZoneInfo keys "):
+                return None
         except zoneinfo.ZoneInfoNotFoundError:
             pass
 

py2docfx/venv/0/Lib/site-packages/babel/messages/_compat.py

@@ -0,0 +1,34 @@
+import sys
+from functools import partial
+
+
+def find_entrypoints(group_name: str):
+    """
+    Find entrypoints of a given group using either `importlib.metadata` or the
+    older `pkg_resources` mechanism.
+
+    Yields tuples of the entrypoint name and a callable function that will
+    load the actual entrypoint.
+    """
+    if sys.version_info >= (3, 10):
+        # "Changed in version 3.10: importlib.metadata is no longer provisional."
+        try:
+            from importlib.metadata import entry_points
+        except ImportError:
+            pass
+        else:
+            eps = entry_points(group=group_name)
+            # Only do this if this implementation of `importlib.metadata` is
+            # modern enough to not return a dict.
+            if not isinstance(eps, dict):
+                for entry_point in eps:
+                    yield (entry_point.name, entry_point.load)
+                return
+
+    try:
+        from pkg_resources import working_set
+    except ImportError:
+        pass
+    else:
+        for entry_point in working_set.iter_entry_points(group_name):
+            yield (entry_point.name, partial(entry_point.load, require=True))

py2docfx/venv/0/Lib/site-packages/babel/messages/catalog.py

@@ -479,7 +479,11 @@ class Catalog:
                 self.last_translator = value
             elif name == 'language':
                 value = value.replace('-', '_')
-                self._set_locale(value)
+                # The `or None` makes sure that the locale is set to None
+                # if the header's value is an empty string, which is what
+                # some tools generate (instead of eliding the empty Language
+                # header altogether).
+                self._set_locale(value or None)
             elif name == 'language-team':
                 self.language_team = value
             elif name == 'content-type':

py2docfx/venv/0/Lib/site-packages/babel/messages/checkers.py

@@ -155,16 +155,11 @@ def _validate_format(format: str, alternative: str) -> None:
 
 
 def _find_checkers() -> list[Callable[[Catalog | None, Message], object]]:
+    from babel.messages._compat import find_entrypoints
     checkers: list[Callable[[Catalog | None, Message], object]] = []
-    try:
-        from pkg_resources import working_set
-    except ImportError:
-        pass
-    else:
-        for entry_point in working_set.iter_entry_points('babel.checkers'):
-            checkers.append(entry_point.load())
+    checkers.extend(load() for (name, load) in find_entrypoints('babel.checkers'))
     if len(checkers) == 0:
-        # if pkg_resources is not available or no usable egg-info was found
+        # if entrypoints are not available or no usable egg-info was found
         # (see #230), just resort to hard-coded checkers
         return [num_plurals, python_format]
     return checkers

py2docfx/venv/0/Lib/site-packages/babel/messages/extract.py

@@ -30,11 +30,13 @@ from collections.abc import (
     Mapping,
     MutableSequence,
 )
+from functools import lru_cache
 from os.path import relpath
 from textwrap import dedent
 from tokenize import COMMENT, NAME, OP, STRING, generate_tokens
 from typing import TYPE_CHECKING, Any
 
+from babel.messages._compat import find_entrypoints
 from babel.util import parse_encoding, parse_future_flags, pathmatch
 
 if TYPE_CHECKING:
@@ -363,6 +365,14 @@ def _match_messages_against_spec(lineno: int, messages: list[str|None], comments
     return lineno, translatable, comments, context
 
 
+@lru_cache(maxsize=None)
+def _find_extractor(name: str):
+    for ep_name, load in find_entrypoints(GROUP_NAME):
+        if ep_name == name:
+            return load()
+    return None
+
+
 def extract(
     method: _ExtractionMethod,
     fileobj: _FileObj,
@@ -421,25 +431,11 @@ def extract(
             module, attrname = method.split(':', 1)
         func = getattr(__import__(module, {}, {}, [attrname]), attrname)
     else:
-        try:
-            from pkg_resources import working_set
-        except ImportError:
-            pass
-        else:
-            for entry_point in working_set.iter_entry_points(GROUP_NAME,
-                                                             method):
-                func = entry_point.load(require=True)
-                break
+        func = _find_extractor(method)
         if func is None:
-            # if pkg_resources is not available or no usable egg-info was found
-            # (see #230), we resort to looking up the builtin extractors
-            # directly
-            builtin = {
-                'ignore': extract_nothing,
-                'python': extract_python,
-                'javascript': extract_javascript,
-            }
-            func = builtin.get(method)
+            # if no named entry point was found,
+            # we resort to looking up a builtin extractor
+            func = _BUILTIN_EXTRACTORS.get(method)
 
     if func is None:
         raise ValueError(f"Unknown extraction method {method!r}")
@@ -640,13 +636,11 @@ def _parse_python_string(value: str, encoding: str, future_flags: int) -> str |
     )
     if isinstance(code, ast.Expression):
         body = code.body
-        if isinstance(body, ast.Str):
-            return body.s
+        if isinstance(body, ast.Constant):
+            return body.value
         if isinstance(body, ast.JoinedStr):  # f-string
-            if all(isinstance(node, ast.Str) for node in body.values):
-                return ''.join(node.s for node in body.values)
             if all(isinstance(node, ast.Constant) for node in body.values):
-                return ''.join(str(node.value) for node in body.values)
+                return ''.join(node.value for node in body.values)
             # TODO: we could raise an error or warning when not all nodes are constants
     return None
 
@@ -840,3 +834,10 @@ def parse_template_string(
                     lineno += len(line_re.findall(expression_contents))
                     expression_contents = ''
         prev_character = character
+
+
+_BUILTIN_EXTRACTORS = {
+    'ignore': extract_nothing,
+    'python': extract_python,
+    'javascript': extract_javascript,
+}