Accepting request 1130338 from devel:languages:python

- update to 3.1.1:
  * Fixed regression in Word(min), reported by Ricardo Coccioli,
    good catch!
  * Fixed bug in bad exception messages raised by Forward
  * Fixed regression in SkipTo, where ignored expressions were
    not checked when looking for the target expression.
  * Fixed type annotation for enable_packrat
  * Some general internal code cleanup
- drop limit-error-messages.patch (upstream)

- Add upstream patch limit-error-messages.patch as a part of
  * Added new class property `identifier` to all Unicode set classes in
    `pyparsing.unicode`, using the class's values for `cls.identchars`
  * ParseResults` now has a new method `deepcopy()`, in addition to the
  * Updated `create_diagram()` code to be compatible with
- do primary/all split only for tumbleweed (similar to flit-core)

OBS-URL: https://build.opensuse.org/request/show/1130338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyparsing?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2023-12-02 16:12:28 +00:00 committed by Git OBS Bridge
commit ddc68dd678
5 changed files with 23 additions and 35 deletions

View File

@ -1,23 +0,0 @@
From e0826a2ec69bc3cf71ba7ca7945774d9213d7d5e Mon Sep 17 00:00:00 2001
From: Kyle Sunden <git@ksunden.space>
Date: Wed, 5 Jul 2023 14:16:50 -0500
Subject: [PATCH] Limit error message overriding when
---
pyparsing/core.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyparsing/core.py b/pyparsing/core.py
index 8233f72c..bfbb391c 100644
--- a/pyparsing/core.py
+++ b/pyparsing/core.py
@@ -4547,7 +4547,8 @@ def parseImpl(self, instring, loc, doActions=True):
try:
return self.expr._parse(instring, loc, doActions, callPreParse=False)
except ParseBaseException as pbe:
- pbe.msg = self.errmsg
+ if not isinstance(self, Forward) or self.customName is not None:
+ pbe.msg = self.errmsg
raise
else:
raise ParseException(instring, loc, "No expression defined", self)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:edb662d6fe322d6e990b1594b5feaeadf806803359e3d4d42f11e295e588f0ea
size 882565

3
pyparsing-3.1.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db
size 884814

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Dec 1 17:06:46 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 3.1.1:
* Fixed regression in Word(min), reported by Ricardo Coccioli,
good catch!
* Fixed bug in bad exception messages raised by Forward
* Fixed regression in SkipTo, where ignored expressions were
not checked when looking for the target expression.
* Fixed type annotation for enable_packrat
* Some general internal code cleanup
- drop limit-error-messages.patch (upstream)
-------------------------------------------------------------------
Tue Jul 11 11:01:42 UTC 2023 - Markéta Machová <mmachova@suse.com>

View File

@ -56,14 +56,12 @@ ExclusiveArch: do-not-build
%endif
%{?sle15_python_module_pythons}
Name: %{pprefix}-pyparsing%{?psuffix}
Version: 3.1.0
Version: 3.1.1
Release: 0
Summary: Grammar Parser Library for Python
License: GPL-2.0-or-later AND MIT AND GPL-3.0-or-later
URL: https://github.com/pyparsing/pyparsing/
Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
#PATCH-FIX-UPSTREAM https://github.com/pyparsing/pyparsing/pull/493 Limit error message overriding
Patch: limit-error-messages.patch
BuildRequires: %{python_module base}
BuildRequires: %{python_module flit-core}
BuildRequires: fdupes