backrefs 5.7.post1__tar.gz → 5.9__tar.gz

{backrefs-5.7.post1 → backrefs-5.9}/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 - 2023 Isaac Muse
+Copyright (c) 2015 - 2025 Isaac Muse
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{backrefs-5.7.post1 → backrefs-5.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: backrefs
-Version: 5.7.post1
+Version: 5.9
 Summary: A wrapper around re and regex that adds additional back references.
 Project-URL: Homepage, https://github.com/facelessuser/backrefs
 Author-email: Isaac Muse <Isaac.Muse@gmail.com>
@@ -13,27 +13,26 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Provides-Extra: extras
 Requires-Dist: regex; extra == 'extras'
 Description-Content-Type: text/markdown
 
 [![Donate via PayPal][donate-image]][donate-link]
-[![Discord][discord-image]][discord-link]
 [![Build][github-ci-image]][github-ci-link]
 [![Coverage Status][codecov-image]][codecov-link]
 [![PyPI Version][pypi-image]][pypi-link]
 [![PyPI Downloads][pypi-down]][pypi-link]
 [![PyPI - Python Version][python-image]][pypi-link]
-![License][license-image-mit]
+[![License][license-image-mit]][license-link]
 
 # Backrefs
 
@@ -43,7 +42,7 @@ Python's Re and/or Regex.  The supported back references actually vary depending
 used as the engine may already have support for some.
 
 ```python
-from backrefs import bre
+>>> from backrefs import bre
 >>> pattern = bre.compile(r'(\p{Letter}+)')
 >>> pattern.sub(r'\C\1\E', 'sometext')
 'SOMETEXT'
@@ -57,10 +56,8 @@ https://facelessuser.github.io/backrefs/
 
 MIT
 
-[github-ci-image]: https://github.com/facelessuser/backrefs/workflows/build/badge.svg?branch=master&event=push
+[github-ci-image]: https://github.com/facelessuser/backrefs/workflows/build/badge.svg
 [github-ci-link]: https://github.com/facelessuser/backrefs/actions?query=workflow%3Abuild+branch%3Amaster
-[discord-image]: https://img.shields.io/discord/678289859768745989?logo=discord&logoColor=aaaaaa&color=mediumpurple&labelColor=333333
-[discord-link]:https://discord.gg/TWs8Tgr
 [codecov-image]: https://img.shields.io/codecov/c/github/facelessuser/backrefs/master.svg?logo=codecov&logoColor=aaaaaa&labelColor=333333
 [codecov-link]: https://codecov.io/github/facelessuser/backrefs
 [pypi-image]: https://img.shields.io/pypi/v/backrefs.svg?logo=pypi&logoColor=aaaaaa&labelColor=333333
@@ -68,6 +65,7 @@ MIT
 [pypi-link]: https://pypi.python.org/pypi/backrefs
 [python-image]: https://img.shields.io/pypi/pyversions/backrefs?logo=python&logoColor=aaaaaa&labelColor=333333
 [license-image-mit]: https://img.shields.io/badge/license-MIT-blue.svg?labelColor=333333
+[license-link]: https://github.com/facelessuser/backrefs/blob/main/LICENSE.md
 [donate-image]: https://img.shields.io/badge/Donate-PayPal-3fabd1?logo=paypal
 [donate-link]: https://www.paypal.me/facelessuser
 

{backrefs-5.7.post1 → backrefs-5.9}/README.md

@@ -1,11 +1,10 @@
 [![Donate via PayPal][donate-image]][donate-link]
-[![Discord][discord-image]][discord-link]
 [![Build][github-ci-image]][github-ci-link]
 [![Coverage Status][codecov-image]][codecov-link]
 [![PyPI Version][pypi-image]][pypi-link]
 [![PyPI Downloads][pypi-down]][pypi-link]
 [![PyPI - Python Version][python-image]][pypi-link]
-![License][license-image-mit]
+[![License][license-image-mit]][license-link]
 
 # Backrefs
 
@@ -15,7 +14,7 @@ Python's Re and/or Regex.  The supported back references actually vary depending
 used as the engine may already have support for some.
 
 ```python
-from backrefs import bre
+>>> from backrefs import bre
 >>> pattern = bre.compile(r'(\p{Letter}+)')
 >>> pattern.sub(r'\C\1\E', 'sometext')
 'SOMETEXT'
@@ -29,10 +28,8 @@ https://facelessuser.github.io/backrefs/
 
 MIT
 
-[github-ci-image]: https://github.com/facelessuser/backrefs/workflows/build/badge.svg?branch=master&event=push
+[github-ci-image]: https://github.com/facelessuser/backrefs/workflows/build/badge.svg
 [github-ci-link]: https://github.com/facelessuser/backrefs/actions?query=workflow%3Abuild+branch%3Amaster
-[discord-image]: https://img.shields.io/discord/678289859768745989?logo=discord&logoColor=aaaaaa&color=mediumpurple&labelColor=333333
-[discord-link]:https://discord.gg/TWs8Tgr
 [codecov-image]: https://img.shields.io/codecov/c/github/facelessuser/backrefs/master.svg?logo=codecov&logoColor=aaaaaa&labelColor=333333
 [codecov-link]: https://codecov.io/github/facelessuser/backrefs
 [pypi-image]: https://img.shields.io/pypi/v/backrefs.svg?logo=pypi&logoColor=aaaaaa&labelColor=333333
@@ -40,6 +37,7 @@ MIT
 [pypi-link]: https://pypi.python.org/pypi/backrefs
 [python-image]: https://img.shields.io/pypi/pyversions/backrefs?logo=python&logoColor=aaaaaa&labelColor=333333
 [license-image-mit]: https://img.shields.io/badge/license-MIT-blue.svg?labelColor=333333
+[license-link]: https://github.com/facelessuser/backrefs/blob/main/LICENSE.md
 [donate-image]: https://img.shields.io/badge/Donate-PayPal-3fabd1?logo=paypal
 [donate-link]: https://www.paypal.me/facelessuser
 

{backrefs-5.7.post1 → backrefs-5.9}/backrefs/__meta__.py

@@ -193,5 +193,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(5, 7, 0, "final", post=1)
+__version_info__ = Version(5, 9, 0, "final")
 __version__ = __version_info__._get_canonical()

{backrefs-5.7.post1 → backrefs-5.9}/backrefs/_bre_parse.py

@@ -204,7 +204,7 @@ class _SearchParser(Generic[AnyStr]):
             c = next(i)
             if c.upper() in _ASCII_LETTERS:
                 prop.append(c)
-            elif not brackets and c != '{' or brackets and c != ':':
+            elif (not brackets and c != '{') or (brackets and c != ':'):
                 raise SyntaxError(f"Unicode property missing '{{' at {i.index - 1}!")
             else:
                 c = next(i)

backrefs-5.9/backrefs/_bregex_typing.py

@@ -0,0 +1,6 @@
+"""Typing objects for the Regex library."""
+import regex  # type: ignore[import]
+from typing import _alias  # type: ignore[attr-defined]
+
+Pattern = _alias(type(regex.compile('')), 1)
+Match = _alias(type(regex.compile('').match('')), 1)

{backrefs-5.7.post1 → backrefs-5.9}/backrefs/bre.py

@@ -481,24 +481,22 @@ def match(
     pattern: AnyStr | Pattern[AnyStr] | Bre[AnyStr],
     string: AnyStr,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> Match[AnyStr] | None:
     """Apply `match` after applying backrefs."""
 
-    return _re.match(_apply_search_backrefs(pattern, flags), string, flags, *args, **kwargs)
+    return _re.match(_apply_search_backrefs(pattern, flags), string, flags=flags, **kwargs)
 
 
 def fullmatch(
     pattern: AnyStr | Pattern[AnyStr] | Bre[AnyStr],
     string: AnyStr,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> Match[AnyStr] | None:
     """Apply `fullmatch` after applying backrefs."""
 
-    return _re.fullmatch(_apply_search_backrefs(pattern, flags), string, flags, *args, **kwargs)
+    return _re.fullmatch(_apply_search_backrefs(pattern, flags), string, flags=flags, **kwargs)
 
 
 def split(
@@ -506,36 +504,39 @@ def split(
     string: AnyStr,
     maxsplit: int = 0,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> list[AnyStr]:
     """Apply `split` after applying backrefs."""
 
-    return _re.split(_apply_search_backrefs(pattern, flags), string, maxsplit, flags, *args, **kwargs)
+    return _re.split(
+        _apply_search_backrefs(pattern, flags),
+        string,
+        maxsplit=maxsplit,
+        flags=flags,
+        **kwargs
+    )
 
 
 def findall(
     pattern: AnyStr | Pattern[AnyStr] | Bre[AnyStr],
     string: AnyStr,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> list[AnyStr] | list[tuple[AnyStr, ...]]:
     """Apply `findall` after applying backrefs."""
 
-    return _re.findall(_apply_search_backrefs(pattern, flags), string, flags, *args, **kwargs)
+    return _re.findall(_apply_search_backrefs(pattern, flags), string, flags=flags, **kwargs)
 
 
 def finditer(
     pattern: AnyStr | Pattern[AnyStr] | Bre[AnyStr],
     string: AnyStr,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> Iterator[Match[AnyStr]]:
     """Apply `finditer` after applying backrefs."""
 
-    return _re.finditer(_apply_search_backrefs(pattern, flags), string, flags, *args, **kwargs)
+    return _re.finditer(_apply_search_backrefs(pattern, flags), string, flags=flags, **kwargs)
 
 
 def sub(
@@ -544,7 +545,6 @@ def sub(
     string: AnyStr,
     count: int = 0,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> AnyStr:
     """Apply `sub` after applying backrefs."""
@@ -559,9 +559,8 @@ def sub(
         pattern,
         (compile_replace(pattern, repl) if is_replace or is_string else repl),
         string,
-        count,
-        0,
-        *args,
+        count=count,
+        flags=0,
         **kwargs
     )
 
@@ -572,7 +571,6 @@ def subf(
     string: AnyStr,
     count: int = 0,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> AnyStr:
     """Apply `sub` with format style replace."""
@@ -588,9 +586,8 @@ def subf(
         pattern,
         (compile_replace(pattern, repl, flags=rflags) if is_replace or is_string else repl),
         string,
-        count,
-        0,
-        *args,
+        count=count,
+        flags=0,
         **kwargs
     )
 
@@ -601,7 +598,6 @@ def subn(
     string: AnyStr,
     count: int = 0,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> tuple[AnyStr, int]:
     """Apply `subn` with format style replace."""
@@ -616,9 +612,8 @@ def subn(
         pattern,
         (compile_replace(pattern, repl) if is_replace or is_string else repl),
         string,
-        count,
-        0,
-        *args,
+        count=count,
+        flags=0,
         **kwargs
     )
 
@@ -629,7 +624,6 @@ def subfn(
     string: AnyStr,
     count: int = 0,
     flags: int | _re.RegexFlag = 0,
-    *args: Any,
     **kwargs: Any
 ) -> tuple[AnyStr, int]:
     """Apply `subn` after applying backrefs."""
@@ -645,9 +639,8 @@ def subfn(
         pattern,
         (compile_replace(pattern, repl, flags=rflags) if is_replace or is_string else repl),
         string,
-        count,
-        0,
-        *args,
+        count=count,
+        flags=0,
         **kwargs
     )
 

{backrefs-5.7.post1 → backrefs-5.9}/docs/src/markdown/about/changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 5.9
+
+-   **NEW**: Add support for Python 3.14.
+-   **ENHANCE**: Switch to deploying with PyPI's "Trusted Publisher".
+
+## 5.8
+
+-   **NEW**: Drop Python 3.8.
+-   **FIX**: Deprecation warnings.
+
 ## 5.7
 
 -   **NEW**: Add support for Python 3.13 beta.
@@ -46,9 +56,9 @@
 -   **FIX**: Match Re and Regex handling when doing a non-format replacement that references a group that is present in
     the search pattern but has no actual captures. Such a case should not fail, but simply return an empty string for
     the group.
--   **FIX**: Format replacements that that have groups with no captures will yield an empty string as the only capture
-    as long as the user does not try to index into any captures as there are no actual captures. This behavior was a bug
-    in Regex that we duplicated and should now be fixed in the latest Regex (mrabarnett/mrab-regex#439) as well as in
+-   **FIX**: Format replacements that have groups with no captures will yield an empty string as the only capture as
+    long as the user does not try to index into any captures as there are no actual captures. This behavior was a bug in
+    Regex that we duplicated and should now be fixed in the latest Regex (mrabarnett/mrab-regex#439) as well as in
     Backrefs.
 
 ## 5.1

{backrefs-5.7.post1 → backrefs-5.9}/docs/src/markdown/refs.md

@@ -23,7 +23,7 @@ Back\ References      | Description
 `\P{UnicodeProperty}` | Inverse Unicode property character class. Can be used in character classes `[]`. See [Unicode Properties](#unicode-properties) for more info.
 `\PX`                 | Inverse Unicode property character class where `X` is the uppercase letter that represents the General Category property. For instance, `\PL` would be equivalent to `\P{L}` or `\P{Letter}`.
 `[[:alnum:]]`         | Though not really a back reference, support for POSIX style character classes is available. See [POSIX Style Properties](#posix-style-properties) for more info.
-`\N{UnicodeName}`     | Named characters are are normally ignored in Re, but Backrefs adds support for them.
+`\N{UnicodeName}`     | Named characters are normally ignored in Re, but Backrefs adds support for them.
 `\m`                  | Start word boundary. Translates to `\b(?=\w)`.
 `\M`                  | End word boundary. Translates to `\b(?<=\w)`.
 `\h`                  | **Deprecated: Use `\p{Horiz_Space}` instead.** Horizontal whitespace. Equivalent to using `[[:blank:]]` or `[\t\p{Zs}]`.
@@ -73,7 +73,7 @@ Back\ References     | Description
 `\U`                 | Wide Unicode character `\U00000057`. Re doesn't translate this notation in raw strings (`#!py3 r"..."`), and Regex doesn't in format templates in raw strings (`#!py3 r"{} {}"`).  This adds support for them.
 `\u`                 | Narrow Unicode character `\u0057`. Re doesn't translate this notation in raw strings (`#!py3 r"..."`), and Regex doesn't in format templates in raw strings (`#!py3 r"{} {}"`).  This adds support for them.
 `\x`                 | Byte character `\x57`. Re doesn't translate this notation in raw strings (`#!py3 r"..."`), and Regex doesn't in format templates in raw strings (`#!py3 r"{} {}"`).  This adds support for them.
-`\N{UnicodeName}`    | Named characters are are normally ignored in Re, but Backrefs adds support for them.
+`\N{UnicodeName}`    | Named characters are normally ignored in Re, but Backrefs adds support for them.
 
 /// tip
 Complex configurations of casing should work fine.
@@ -199,7 +199,7 @@ Block properties have a similar short form as Script and Binary properties.  For
 a block. If we wanted to match characters in the `Basic_Latin` block, we could use the syntax `\p{InBasic_Latin}`. This
 would be the same as `\p{Block: Basic_Latin}` or `\p{Basic_Latin}`.
 
-/// warn | Short Name Conflicts
+/// warning | Short Name Conflicts
 When it comes to short names, each new Unicode version, there is a risk that new properties could cause conflicts
 with existing names and/or aliases. Currently, most of the conflicts involve the Block properties. To reduce
 friction, they are evaluated last.

{backrefs-5.7.post1 → backrefs-5.9}/docs/src/markdown/usage.md

@@ -135,7 +135,7 @@ why.
 1.  Regex's original implementation is very much like it's non-format style replacement accept for two differences: you
     can access individual captures and you cannot use Python string back references such as specifying Unicode via
     `\u<code>`, etc. In Backrefs, we've enhanced the syntax -- for both Re and Regex -- to allow back references to work
-    along side brace replacements. This means you can use string back references and and built-in Backrefs features like
+    along side brace replacements. This means you can use string back references and built-in Backrefs features like
     `\C...\E` or `\L...\E`.
 
     ```pycon3

{backrefs-5.7.post1 → backrefs-5.9}/hatch_build.py

@@ -74,12 +74,12 @@ class CustomMetadataHook(MetadataHookInterface):
             'License :: OSI Approved :: MIT License',
             'Operating System :: OS Independent',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',
             'Programming Language :: Python :: 3.10',
             'Programming Language :: Python :: 3.11',
             'Programming Language :: Python :: 3.12',
             'Programming Language :: Python :: 3.13',
+            'Programming Language :: Python :: 3.14',
             'Topic :: Software Development :: Libraries :: Python Modules',
             'Typing :: Typed'
         ]

{backrefs-5.7.post1 → backrefs-5.9}/mkdocs.yml

@@ -4,7 +4,7 @@ repo_url: https://github.com/facelessuser/backrefs
 edit_uri: tree/master/docs/src/markdown
 site_description: A library to add additional back references to regular expressions.
 copyright: |
-  Copyright &copy; 2015 - 2023 <a href="https://github.com/facelessuser"  target="_blank" rel="noopener">Isaac Muse</a>
+  Copyright &copy; 2015 - 2025 <a href="https://github.com/facelessuser"  target="_blank" rel="noopener">Isaac Muse</a>
 
 docs_dir: docs/src/markdown
 theme:
@@ -152,8 +152,6 @@ extra:
   social:
     - icon: fontawesome/brands/github
       link: https://github.com/facelessuser
-    - icon: fontawesome/brands/discord
-      link: https://discord.gg/TWs8Tgr
 
 plugins:
   - search

{backrefs-5.7.post1 → backrefs-5.9}/pyproject.toml

@@ -9,7 +9,7 @@ name = "backrefs"
 description = "A wrapper around re and regex that adds additional back references."
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     { name = "Isaac Muse", email = "Isaac.Muse@gmail.com" },
 ]
@@ -125,6 +125,8 @@ lint.ignore = [
     "RUF012",
     "RUF005",
     "PGH004",
+    "RUF022",
+    "RUF023",
     "RUF100"
 ]
 
@@ -133,7 +135,7 @@ legacy_tox_ini = """
 [tox]
 isolated_build = true
 envlist =
-    py38,py39,py310,py311,py312,
+    py39,py310,py311,py312,py313,py314,
     lint
 
 [testenv]
@@ -155,7 +157,7 @@ passenv = *
 deps=
     -r requirements/docs.txt
 commands=
-    {envpython} -m mkdocs build --clean --verbose --strict
+    {envbindir}/mkdocs build --clean --verbose --strict
     {envbindir}/pyspelling
 
 [testenv:lint]

{backrefs-5.7.post1 → backrefs-5.9}/tests/test_bre.py

@@ -947,17 +947,17 @@ class TestReplaceTemplate(unittest.TestCase):
     def test_format_conversions(self):
         """Test string format conversion paths."""
 
-        self.assertTrue(bre.subf('test', r'{0.index}', 'test').startswith('<built-in method'))
+        self.assertTrue(bre.subf('test', r'{0.index}', 'test').startswith(('<built-in method', '<bound method')))
         self.assertEqual(bre.subf('test', r'{0.__class__.__name__}', 'test'), 'str')
-        self.assertTrue(bre.subf('test', r'{0.index!s}', 'test').startswith('<built-in method'))
+        self.assertTrue(bre.subf('test', r'{0.index!s}', 'test').startswith(('<built-in method', '<bound method')))
         self.assertEqual(bre.subf('test', r'{0.__class__.__name__!s}', 'test'), 'str')
-        self.assertTrue(bre.subf('test', r'{0.index!a}', 'test').startswith('<built-in method'))
+        self.assertTrue(bre.subf('test', r'{0.index!a}', 'test').startswith(('<built-in method', '<bound method')))
 
-        self.assertTrue(bre.subf(b'test', br'{0.index}', b'test').startswith(b'<built-in method'))
+        self.assertTrue(bre.subf(b'test', br'{0.index}', b'test').startswith((b'<built-in method', b'<bound method')))
         self.assertEqual(bre.subf(b'test', br'{0.__class__.__name__}', b'test'), b'bytes')
-        self.assertTrue(bre.subf(b'test', br'{0.index!s}', b'test').startswith(b'<built-in method'))
+        self.assertTrue(bre.subf(b'test', br'{0.index!s}', b'test').startswith((b'<built-in method', b'<bound method')))
         self.assertEqual(bre.subf(b'test', br'{0.__class__.__name__!s}', b'test'), b'bytes')
-        self.assertTrue(bre.subf('test', r'{0.index!a}', 'test').startswith('<built-in method'))
+        self.assertTrue(bre.subf('test', r'{0.index!a}', 'test').startswith(('<built-in method', '<bound method')))
 
     def test_incompatible_strings(self):
         """Test incompatible string types."""

{backrefs-5.7.post1 → backrefs-5.9}/tests/test_bregex.py

@@ -693,17 +693,21 @@ class TestReplaceTemplate(unittest.TestCase):
     def test_format_conversions(self):
         """Test string format conversion paths."""
 
-        self.assertTrue(bregex.subf('test', r'{0.index}', 'test').startswith('<built-in method'))
+        self.assertTrue(bregex.subf('test', r'{0.index}', 'test').startswith(('<built-in method', '<bound method')))
         self.assertEqual(bregex.subf('test', r'{0.__class__.__name__}', 'test'), 'str')
-        self.assertTrue(bregex.subf('test', r'{0.index!s}', 'test').startswith('<built-in method'))
+        self.assertTrue(bregex.subf('test', r'{0.index!s}', 'test').startswith(('<built-in method', '<bound method')))
         self.assertEqual(bregex.subf('test', r'{0.__class__.__name__!s}', 'test'), 'str')
-        self.assertTrue(bregex.subf('test', r'{0.index!a}', 'test').startswith('<built-in method'))
+        self.assertTrue(bregex.subf('test', r'{0.index!a}', 'test').startswith(('<built-in method', '<bound method')))
 
-        self.assertTrue(bregex.subf(b'test', br'{0.index}', b'test').startswith(b'<built-in method'))
+        self.assertTrue(bregex.subf(
+            b'test', br'{0.index}', b'test').startswith((b'<built-in method', b'<bound method'))
+        )
         self.assertEqual(bregex.subf(b'test', br'{0.__class__.__name__}', b'test'), b'bytes')
-        self.assertTrue(bregex.subf(b'test', br'{0.index!s}', b'test').startswith(b'<built-in method'))
+        self.assertTrue(
+            bregex.subf(b'test', br'{0.index!s}', b'test').startswith((b'<built-in method', b'<bound method'))
+        )
         self.assertEqual(bregex.subf(b'test', br'{0.__class__.__name__!s}', b'test'), b'bytes')
-        self.assertTrue(bregex.subf('test', r'{0.index!a}', 'test').startswith('<built-in method'))
+        self.assertTrue(bregex.subf('test', r'{0.index!a}', 'test').startswith(('<built-in method', '<bound method')))
 
     def test_incompatible_strings(self):
         """Test incompatible string types."""

{backrefs-5.7.post1 → backrefs-5.9}/tools/unipropgen.py

@@ -1,7 +1,6 @@
 """Generate a Unicode prop table for Python builds."""
 import sys
 import unicodedata
-import codecs
 import os
 import re
 
@@ -201,7 +200,7 @@ def discover_categories():
 
     # NF Quick Check categories
     file_name = os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedNormalizationProps.txt')
-    with codecs.open(file_name, 'r', 'utf-8') as uf:
+    with open(file_name, 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -227,7 +226,7 @@ def discover_categories():
         binary_props.append(('emoji-data.txt', None))
 
     for filename, include in binary_props:
-        with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, filename), 'r', 'utf-8') as uf:
+        with open(os.path.join(HOME, 'unicodedata', UNIVERSION, filename), 'r', encoding='utf-8') as uf:
             for line in uf:
                 if not line.startswith('#'):
                     data = line.split('#')[0].split(';')
@@ -245,7 +244,7 @@ def discover_categories():
 def gen_blocks(output, ascii_props=False, append=False, prefix="", aliases=None):
     """Generate Unicode blocks."""
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         f.write('%s_blocks: dict[str, str] = {' % prefix)
@@ -257,7 +256,7 @@ def gen_blocks(output, ascii_props=False, append=False, prefix="", aliases=None)
         max_range = MAXUNICODE
         formatter = uniformat
 
-        with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'Blocks.txt'), 'r', 'utf-8') as uf:
+        with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'Blocks.txt'), 'r', encoding='utf-8') as uf:
             for line in uf:
                 if not line.startswith('#'):
                     data = line.split(';')
@@ -321,7 +320,7 @@ def gen_ccc(output, ascii_props=False, append=False, prefix="", aliases=None):
         for v in aliases.get('canonicalcombiningclass', {}).values():
             obj[v] = []
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedCombiningClass.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedCombiningClass.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -350,7 +349,7 @@ def gen_ccc(output, ascii_props=False, append=False, prefix="", aliases=None):
     # Convert characters values to ranges
     char2range(obj, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -382,13 +381,13 @@ def gen_scripts(
             obj2[v] = []
 
     alias = {}
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyValueAliases.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyValueAliases.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             if line.startswith('sc ;'):
                 values = line.split(';')
                 alias[format_name(values[1].strip())] = format_name(values[2].strip())
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name_ext), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name_ext), 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -404,7 +403,7 @@ def gen_scripts(
 
                     obj2[ext].extend(span)
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name), 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -439,7 +438,7 @@ def gen_scripts(
     char2range(obj, is_bytes=ascii_props)
     char2range(obj2, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -454,7 +453,7 @@ def gen_scripts(
                 f.write(',\n')
             i += 1
 
-    with codecs.open(output_ext, 'a' if append else 'w', 'utf-8') as f:
+    with open(output_ext, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -482,7 +481,7 @@ def gen_enum(
         for v in aliases.get(format_name(obj_name), {}).values():
             obj[v] = []
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, file_name), 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -508,7 +507,7 @@ def gen_enum(
     # Convert characters values to ranges
     char2range(obj, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -535,7 +534,7 @@ def gen_age(output, ascii_props=False, append=False, prefix="", aliases=None):
             obj[v] = []
 
     all_chars = (ALL_CHARS - ASCII_UNUSED) if ascii_props else ALL_CHARS
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedAge.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedAge.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -564,7 +563,7 @@ def gen_age(output, ascii_props=False, append=False, prefix="", aliases=None):
     # Convert characters values to ranges
     char2range(obj, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -586,7 +585,7 @@ def gen_nf_quick_check(output, ascii_props=False, append=False, prefix="", alias
     nf = {}
     all_chars = (ALL_CHARS - ASCII_UNUSED) if ascii_props else ALL_CHARS
     file_name = os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedNormalizationProps.txt')
-    with codecs.open(file_name, 'r', 'utf-8') as uf:
+    with open(file_name, 'r', encoding='utf-8') as uf:
         for line in uf:
             if not line.startswith('#'):
                 data = line.split('#')[0].split(';')
@@ -626,7 +625,7 @@ def gen_nf_quick_check(output, ascii_props=False, append=False, prefix="", alias
     # Convert characters values to ranges
     char2range(nf, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         for key, value in sorted(nf.items()):
@@ -670,7 +669,7 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
     binary['vertspace'] = [x for x in binary['vertspace'] if x <= max_range]
 
     for filename, include in binary_props:
-        with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, filename), 'r', 'utf-8') as uf:
+        with open(os.path.join(HOME, 'unicodedata', UNIVERSION, filename), 'r', encoding='utf-8') as uf:
             for line in uf:
                 if not line.startswith('#'):
                     data = line.split('#')[0].split(';')
@@ -687,7 +686,7 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
                         continue
                     binary[name].extend(span)
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'CompositionExclusions.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'CompositionExclusions.txt'), 'r', encoding='utf-8') as uf:
         name = 'compositionexclusion'
         for line in uf:
             if not line.startswith('#'):
@@ -703,7 +702,7 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
                 binary[name].extend(span)
 
     file_name = os.path.join(HOME, 'unicodedata', UNIVERSION, 'DerivedNormalizationProps.txt')
-    with codecs.open(file_name, 'r', 'utf-8') as uf:
+    with open(file_name, 'r', encoding='utf-8') as uf:
         name = "fullcompositionexclusion"
         for line in uf:
             if not line.startswith('#'):
@@ -720,7 +719,7 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
                     binary[name] = []
                 binary[name].extend(span)
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', encoding='utf-8') as uf:
         name = 'bidimirrored'
         for line in uf:
             data = line.strip().split(';')
@@ -744,9 +743,9 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
     # One off Unicode property found under https://unicode.org/reports/tr18/#Compatibility_Properties
     # `Word: [\p{alnum}\p{M}\p{Pc}\p{JoinControl}]`
     s = set(binary["alnum"])
-    s |= set(table['m']['c'])
-    s |= set(table['m']['e'])
-    s |= set(table['m']['n'])
+    for k, v in table['m'].items():
+        if not k.startswith('^'):
+            s |= set(v)
     s |= set(table["p"]["c"])
     s |= set(binary["joincontrol"])
     binary["word"] = list(s)
@@ -759,7 +758,7 @@ def gen_binary(table, output, ascii_props=False, append=False, prefix="", aliase
     # Convert characters values to ranges
     char2range(binary, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -786,7 +785,7 @@ def gen_bidi(output, ascii_props=False, append=False, prefix="", aliases=None):
             bidi_class[v] = []
 
     max_range = MAXVALIDASCII if ascii_props else MAXUNICODE
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             data = line.strip().split(';')
             if data:
@@ -810,7 +809,7 @@ def gen_bidi(output, ascii_props=False, append=False, prefix="", aliases=None):
     # Convert characters values to ranges
     char2range(bidi_class, is_bytes=ascii_props)
 
-    with codecs.open(output, 'a' if append else 'w', 'utf-8') as f:
+    with open(output, 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         f.write('%s_bidi_classes: dict[str, str] = {\n' % prefix)
@@ -913,7 +912,7 @@ def gen_alias(nonbinary, binary, output):
         'catalog', 'enumerated', 'numeric', 'miscellaneous'
     )
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyAliases.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyAliases.txt'), 'r', encoding='utf-8') as uf:
         div = False
         capture = False
         name = None
@@ -952,7 +951,7 @@ def gen_alias(nonbinary, binary, output):
                     for d in data[1:]:
                         alias[name][d] = data[0]
 
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyValueAliases.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'PropertyValueAliases.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             m = alias_re.match(line)
             if m:
@@ -992,7 +991,7 @@ def gen_alias(nonbinary, binary, output):
     alias['binary']['h'] = 'horizspace'
     alias['binary']['v'] = 'vertspace'
 
-    with codecs.open(output, 'w', 'utf-8') as f:
+    with open(output, 'w', encoding='utf-8') as f:
         f.write(HEADER.format(UNIVERSION, TYPING))
         f.write('%s_alias: dict[str, dict[str, str]] = {\n' % prefix)
         count = len(alias) - 1
@@ -1037,7 +1036,7 @@ def gen_properties(output, files, aliases, ascii_props=False, append=False):
     # before sending it through.
     table = {'l': {'c': []}}
     itable = {'l': {}}
-    with codecs.open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', 'utf-8') as uf:
+    with open(os.path.join(HOME, 'unicodedata', UNIVERSION, 'UnicodeData.txt'), 'r', encoding='utf-8') as uf:
         for line in uf:
             data = line.strip().split(';')
             if data:
@@ -1194,7 +1193,7 @@ def gen_properties(output, files, aliases, ascii_props=False, append=False):
     for k1, v1 in itable.items():
         table[k1]['^'] = v1['^']
 
-    with codecs.open(files['gc'], 'a' if append else 'w', 'utf-8') as f:
+    with open(files['gc'], 'a' if append else 'w', encoding='utf-8') as f:
         if not append:
             f.write(HEADER.format(UNIVERSION, TYPING))
         # Write out the Unicode properties
@@ -1219,7 +1218,7 @@ def gen_properties(output, files, aliases, ascii_props=False, append=False):
             i += 1
 
     if not append:
-        with codecs.open(os.path.join(output, '__init__.py'), 'w') as f:
+        with open(os.path.join(output, '__init__.py'), 'w') as f:
             f.write(HEADER.format(UNIVERSION, ''))
             for x in sorted(files):
                 f.write('from .%s import *  # noqa\n' % os.path.basename(files[x])[:-3])

backrefs-5.7.post1/backrefs/_bregex_typing.py

@@ -1,13 +0,0 @@
-"""Typing objects for the Regex library."""
-from typing import AnyStr
-import regex  # type: ignore[import]
-import sys
-
-from typing import _alias  # type: ignore[attr-defined]
-
-if sys.version_info >= (3, 9):
-    Pattern = _alias(type(regex.compile('')), 1)
-    Match = _alias(type(regex.compile('').match('')), 1)
-else:
-    Pattern = _alias(type(regex.compile('')), AnyStr)
-    Match = _alias(type(regex.compile('').match('')), AnyStr)