Accepting request 1098099 from home:mcalabkova:branches:devel:languages:python:numeric

- Add upstream patch limit-error-messages.patch as a part of 
  a workaround for boo#1213007

Should go together with matplotlib

OBS-URL: https://build.opensuse.org/request/show/1098099
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=96
This commit is contained in:
Matej Cepl 2023-07-12 08:26:26 +00:00 committed by Git OBS Bridge
parent e3ed91f7a9
commit 74909f534d
3 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,23 @@
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 +1,9 @@
-------------------------------------------------------------------
Tue Jul 11 11:01:42 UTC 2023 - Markéta Machová <mmachova@suse.com>
- Add upstream patch limit-error-messages.patch as a part of
a workaround for boo#1213007
-------------------------------------------------------------------
Sat Jul 1 13:52:01 UTC 2023 - Markéta Machová <mmachova@suse.com>

View File

@ -62,6 +62,8 @@ 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
@ -91,6 +93,7 @@ code uses to construct the grammar directly in Python code.
%prep
%setup -q -n %{modname}-%{version}
%autopatch -p1
%if !%{with test}
%build