wikitextparser 0.55.9__tar.gz → 0.55.11__tar.gz

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/.github/workflows/tests.yml

@@ -13,16 +13,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version
@@ -35,8 +35,8 @@ jobs:
         run: pytest --cov=wikitextparser tests --cov-report=xml --cov-fail-under=80
       - name: Upload coverage to Codecov
         # https://github.com/codecov/codecov-action
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ./coverage.xml
           env_vars: OS,PYTHON
-          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/CHANGELOG.rst

@@ -1,6 +1,14 @@
+v0.55.11
+--------
+* Performance improvements in ``__setitem__``/``__delitem__`` and ``pformat``/``plain_text`` methods. (#131)
+
+v0.55.10
+--------
+* Fixed a bug in ``plain_text`` causing ``IndexError`` when using a custom function to replace ``templates``/``parser_functions``.
+
 v0.55.9
 -------
-- Fixed a bug in plain text not detecting images with multiple dots correctly. (#129)
+- Fixed a bug in ``plain_text`` not detecting images with multiple dots correctly. (#129)
 
 v0.55.8
 -------

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wikitextparser
-Version: 0.55.9
+Version: 0.55.11
 Summary: A simple parsing tool for MediaWiki's wikitext markup.
 Keywords: MediaWiki,wikitext,parser
 Author-email: 5j9 <5j9@users.noreply.github.com>

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/pyproject.toml

@@ -48,12 +48,12 @@ exclude = ['tests/', 'doc/', 'dev/']
 [tool.ruff]
 line-length = 79
 format.quote-style = 'single'
-isort.combine-as-imports = true
-extend-select = [
+lint.isort.combine-as-imports = true
+lint.extend-select = [
     'I',  # isort
     'UP',  # pyupgrade
 ]
-ignore = [
+lint.ignore = [
     'UP027',  # list comprehensions are faster than generator expressions
     'E721',  # Do not compare types, use `isinstance()`
 ]

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/__init__.py

@@ -1,5 +1,5 @@
 # Scheme: [N!]N(.N)*[{a|b|rc}N][.postN][.devN]
-__version__ = '0.55.9'
+__version__ = '0.55.11'
 
 from . import _wikitext
 from ._argument import Argument  # noqa: F401

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_argument.py

@@ -13,7 +13,6 @@ ARG_SHADOW_FULLMATCH = rc(
 
 
 class Argument(SubWikiText):
-
     """Create a new Argument Object.
 
     Note that in MediaWiki documentation `arguments` are (also) called

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_config.py

@@ -1,6 +1,5 @@
 """Utilities to override default configurations."""
 
-
 from collections import defaultdict as _defaultdict
 from typing import Iterable as _Iterable
 

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_parser_function.py

@@ -11,7 +11,6 @@ PF_NAME_ARGS_FULLMATCH = rc(
 
 
 class SubWikiTextWithArgs(SubWikiText):
-
     """Define common attributes for `Template` and `ParserFunction`."""
 
     __slots__ = ()

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_spans.py

@@ -1,4 +1,5 @@
 """Define the functions required for parsing wikitext into spans."""
+
 from functools import partial
 from typing import Callable, Dict, Optional
 

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_table.py

@@ -296,9 +296,9 @@ class Table(SubWikiTextWithAttrs):
         m = CAPTION_MATCH(shadow)
         if m:
             s = m.end('attrs')
-            self[
-                s if s != -1 else m.end('preattrs') : m.end('caption')
-            ] = newcaption
+            self[s if s != -1 else m.end('preattrs') : m.end('caption')] = (
+                newcaption
+            )
             return
         # There is no caption. Create one.
         h, s, t = shadow.partition(b'\n')

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_tag.py

@@ -45,7 +45,6 @@ TAG_FULLMATCH = rc(
 
 
 class SubWikiTextWithAttrs(SubWikiText):
-
     """Define a class for SubWikiText objects that have attributes.
 
     Any class that is going to inherit from SubWikiTextWithAttrs should provide

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_template.py

@@ -18,7 +18,6 @@ T = TypeVar('T')
 
 
 class Template(SubWikiTextWithArgs):
-
     """Convert strings to Template objects.
 
     The string should start with {{ and end with }}.

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_wikilink.py

@@ -1,6 +1,5 @@
 """Define the WikiLink class."""
 
-
 from typing import List, Optional, Tuple
 
 from regex import DOTALL

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_wikilist.py

@@ -33,7 +33,6 @@ LIST_PATTERN_FORMAT = (  # noqa
 
 
 class WikiList(SubWikiText):
-
     """Class to represent ordered, unordered, and definition lists."""
 
     __slots__ = 'pattern', '_match_cache'

{wikitextparser-0.55.9 → wikitextparser-0.55.11}/wikitextparser/_wikitext.py

@@ -488,6 +488,7 @@ class WikiText:
         # Note: The following algorithm won't work correctly if spans
         # are not sorted.
         # Note: No span should be removed from _type_to_spans.
+        rmlength = rmstop - rmstart
         for spans in self._type_to_spans.values():
             i = len(spans) - 1
             while i >= 0:
@@ -495,7 +496,6 @@ class WikiText:
                 s, e, _, b = span = spans[i]
                 if rmstop <= s:
                     # rmstart <= rmstop <= s <= e
-                    rmlength = rmstop - rmstart
                     # todo
                     span[:] = s - rmlength, e - rmlength, None, None
                     i -= 1
@@ -508,7 +508,7 @@ class WikiText:
                     if rmstop < e:
                         # rmstart < s <= rmstop < e
                         # todo: update byte_array instead
-                        span[:] = rmstart, e + rmstart - rmstop, None, None
+                        span[:] = rmstart, e - rmlength, None, None
                         i -= 1
                         if i < 0:
                             break
@@ -531,7 +531,7 @@ class WikiText:
                     s, e, _, _ = span = spans[i]
                     continue
                 # s <= rmstart <= rmstop <= e
-                span[1] -= rmstop - rmstart
+                span[1] -= rmlength
                 span[2] = None
                 # todo: update bytearray instead
                 span[3] = None
@@ -626,7 +626,9 @@ class WikiText:
         return {
             type_: [
                 [s - ss, e - ss, m, ba[:] if ba is not None else None]
-                for s, e, m, ba in spans[bisect_left(spans, [ss]) :]
+                for s, e, m, ba in spans[
+                    bisect_left(spans, [ss]) : bisect_left(spans, [se])
+                ]
                 if e <= se
             ]
             for type_, spans in self._type_to_spans.items()
@@ -677,7 +679,7 @@ class WikiText:
             remove(b, e)
 
         if callable(replace_templates):
-            for template in self.templates:
+            for template in parsed.templates:
                 b, e = template._span_data[:2]  # noqa
                 if lst[b] is None:  # overwritten
                     continue
@@ -688,7 +690,7 @@ class WikiText:
                 remove(b, e)
 
         if callable(replace_parser_functions):
-            for pf in self.parser_functions:
+            for pf in parsed.parser_functions:
                 b, e = pf._span_data[:2]
                 if lst[b] is None:  # already overwritten
                     continue
@@ -1022,8 +1024,8 @@ class WikiText:
         odd_bold_italics = False
         shadow_copy = self._shadow[:]
         append_match = bold_matches.append
-        for match in BOLD_ITALIC_FINDITER(shadow_copy):
-            if match[4] is not None:  # newline or string end
+        for m in BOLD_ITALIC_FINDITER(shadow_copy):
+            if m[4] is not None:  # newline or string end
                 if (
                     odd_italics is True
                     and (len(bold_matches) + odd_bold_italics) % 2
@@ -1053,17 +1055,17 @@ class WikiText:
                 bold_matches.clear()
                 odd_italics = False
                 continue
-            if match[2] is None:  # italic
+            if m[2] is None:  # italic
                 odd_italics ^= True
                 continue
-            if match[3] is None:  # bold
-                s, e = match.span(1)
+            if m[3] is None:  # bold
+                s, e = m.span(1)
                 if s != e:  # four apostrophes, hide the first one
                     shadow_copy[s] = 95  # _
-                append_match(match)
+                append_match(m)
                 continue
             # bold-italic
-            s, e = match.span(1)
+            s, e = m.span(1)
             es = e - s
             if es:  # more than 5 apostrophes, hide the previous ones
                 shadow_copy[s:e] = b'_' * es
@@ -1338,7 +1340,7 @@ class WikiText:
 
         if level is not None:
             section_spans = compress(
-                section_spans, [l == level for l in levels]
+                section_spans, [lvl == level for lvl in levels]
             )
 
         return self._section_spans_to_sections(section_spans, shadow)