pyparsing 3.2.2__tar.gz → 3.2.3__tar.gz

{pyparsing-3.2.2 → pyparsing-3.2.3}/CHANGES

@@ -35,7 +35,7 @@ Required Python versions by pyparsing version
 +--------------------------------------------------+-------------------+
 | pyparsing version                                | Required Python   |
 +==================================================+===================+
-| 3.2.0 - 3.2.2                                    | 3.9 or later      |
+| 3.2.0 - later                                    | 3.9 or later      |
 | 3.0.8 - 3.1.4                                    | 3.6.8 or later    |
 | 3.0.0 - 3.0.7 (these versions are discouraged)   | 3.6 or later      |
 | 2.4.7                                            | 2.7 or later      |
@@ -43,6 +43,14 @@ Required Python versions by pyparsing version
 +--------------------------------------------------+-------------------+
 
 
+Version 3.2.3 - March, 2025
+---------------------------
+- Fixed bug released in 3.2.2 in which `nested_expr` could overwrite parse actions
+  for defined content, and could truncate list of items within a nested list.
+  Fixes Issue #600, reported by hoxbro and luisglft, with helpful diag logs and
+  repro code.
+
+
 Version 3.2.2 - March, 2025
 ---------------------------
 - Released `cvt_pyparsing_pep8_names.py` conversion utility to upgrade pyparsing-based

{pyparsing-3.2.2 → pyparsing-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyparsing
-Version: 3.2.2
+Version: 3.2.3
 Summary: pyparsing module - Classes and methods to define and execute parsing grammars
 Author-email: Paul McGuire <ptmcg.gm+pyparsing@gmail.com>
 Requires-Python: >=3.9

{pyparsing-3.2.2 → pyparsing-3.2.3}/pyparsing/__init__.py

@@ -120,8 +120,8 @@ class version_info(NamedTuple):
         return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
 
 
-__version_info__ = version_info(3, 2, 2, "final", 1)
-__version_time__ = "22 Mar 2025 22:09 UTC"
+__version_info__ = version_info(3, 2, 3, "final", 1)
+__version_time__ = "25 Mar 2025 01:38 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire <ptmcg.gm+pyparsing@gmail.com>"

{pyparsing-3.2.2 → pyparsing-3.2.3}/pyparsing/helpers.py

@@ -418,6 +418,8 @@ def locatedExpr(expr: ParserElement) -> ParserElement:
     )
 
 
+# define special default value to permit None as a significant value for
+# ignore_expr
 _NO_IGNORE_EXPR_GIVEN = NoMatch()
 
 
@@ -498,11 +500,13 @@ def nested_expr(
     """
     if ignoreExpr != ignore_expr:
         ignoreExpr = ignore_expr if ignoreExpr is _NO_IGNORE_EXPR_GIVEN else ignoreExpr
+
     if ignoreExpr is _NO_IGNORE_EXPR_GIVEN:
         ignoreExpr = quoted_string()
 
     if opener == closer:
         raise ValueError("opening and closing strings cannot be the same")
+
     if content is None:
         if isinstance(opener, str_type) and isinstance(closer, str_type):
             opener = typing.cast(str, opener)
@@ -519,8 +523,11 @@ def nested_expr(
                         )
                     )
                 else:
-                    content = empty.copy() + CharsNotIn(
-                        opener + closer + ParserElement.DEFAULT_WHITE_CHARS
+                    content = Combine(
+                        Empty()
+                        + CharsNotIn(
+                            opener + closer + ParserElement.DEFAULT_WHITE_CHARS
+                        )
                     )
             else:
                 if ignoreExpr is not None:
@@ -544,10 +551,12 @@ def nested_expr(
             raise ValueError(
                 "opening and closing arguments must be strings if no content expression is given"
             )
-    if ParserElement.DEFAULT_WHITE_CHARS:
-        content.set_parse_action(
-            lambda t: t[0].strip(ParserElement.DEFAULT_WHITE_CHARS)
-        )
+
+        # for these internally-created context expressions, simulate whitespace-skipping
+        if ParserElement.DEFAULT_WHITE_CHARS:
+            content.set_parse_action(
+                lambda t: t[0].strip(ParserElement.DEFAULT_WHITE_CHARS)
+            )
 
     ret = Forward()
     if ignoreExpr is not None:
@@ -556,7 +565,9 @@ def nested_expr(
         )
     else:
         ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
+
     ret.set_name(f"nested {opener}{closer} expression")
+
     # don't override error message from content expressions
     ret.errmsg = None
     return ret
@@ -621,7 +632,7 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
 
 
 def make_html_tags(
-    tag_str: Union[str, ParserElement]
+    tag_str: Union[str, ParserElement],
 ) -> tuple[ParserElement, ParserElement]:
     """Helper to construct opening and closing tag expressions for HTML,
     given a tag name. Matches tags in either upper or lower case,
@@ -648,7 +659,7 @@ def make_html_tags(
 
 
 def make_xml_tags(
-    tag_str: Union[str, ParserElement]
+    tag_str: Union[str, ParserElement],
 ) -> tuple[ParserElement, ParserElement]:
     """Helper to construct opening and closing tag expressions for XML,
     given a tag name. Matches tags only in the given upper/lower case.

{pyparsing-3.2.2 → pyparsing-3.2.3}/tests/test_unit.py

@@ -5463,6 +5463,28 @@ class Test02_WithoutPackrat(ppt.TestParseResultsAsserts, TestCase):
         # make sure things have been put back properly
         self.assertEqual(pp.ParserElement.DEFAULT_WHITE_CHARS, prior_ws_chars)
 
+    def testNestedExpressions4(self):
+        allowed = pp.alphas
+        plot_options_short = pp.nestedExpr('[',
+                                           ']',
+                                           content=pp.OneOrMore(pp.Word(allowed) ^ pp.quotedString)
+                                           ).setResultsName('plot_options')
+
+        self.assertParseAndCheckList(
+            plot_options_short,
+            "[slkjdfl sldjf [lsdf'lsdf']]",
+            [['slkjdfl', 'sldjf', ['lsdf', "'lsdf'"]]]
+        )
+
+    def testNestedExpressionDoesNotOverwriteParseActions(self):
+        content = pp.Word(pp.nums + " ")
+
+        content.add_parse_action(lambda t: None)
+        orig_pa = content.parseAction[0]
+
+        expr = pp.nested_expr(content=content)
+        assert content.parseAction[0] is orig_pa
+
     def testWordMinMaxArgs(self):
         parsers = [
             "A" + pp.Word(pp.nums),