Bug#1129563: python3-fiona: please apply patch for compatibility with pyparsing 3.3.2

[Alexandre Detiste]

Package: python3-fiona
Version: 1.10.1-4
Severity: important

Dear Maintainers,

pyparsing 3.3.2-1 is now in experimental.

The autopkgtest for fiona are failing:

 https://qa.debian.org/excuses.php?experimental=1&package=pyparsing

 132s ___________________ ERROR collecting tests/test_features.py ____________________
 132s tests/test_features.py:10: in <module>
 132s     from fiona.features import (  # type: ignore
 132s /usr/lib/python3/dist-packages/fiona/features.py:15: in <module>
 132s     from ._vendor import snuggs
 132s /usr/lib/python3/dist-packages/fiona/_vendor/snuggs.py:161: in <module>
 132s     op = oneOf(" ".join(op_map.keys())).set_parse_action(
 132s          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 132s /usr/lib/python3/dist-packages/pyparsing/util.py:472: in _inner
 132s     warnings.warn(
 132s E   pyparsing.warnings.PyparsingDeprecationWarning: 'oneOf' deprecated - use 'one_of'
 132s =============================== warnings summary ===============================



Please consider applying this trivial patch hereunder.

pyparsing is itself a requirement of the new OpenStack release.

 https://wiki.debian.org/OpenStack/gazpacho-to-update

Greetings

Alexandre






diff --git a/fiona/_vendor/snuggs.py b/fiona/_vendor/snuggs.py
index 638f397..686eff3 100644
--- a/fiona/_vendor/snuggs.py
+++ b/fiona/_vendor/snuggs.py
@@ -34,7 +34,7 @@ from typing import Mapping
 
 from pyparsing import (  # type: ignore
     Keyword,
-    oneOf,
+    one_of,
     Literal,
     QuotedString,
     ParseException,
@@ -158,7 +158,7 @@ var = pyparsing_common.identifier.set_parse_action(resolve_var)
 string = QuotedString("'") | QuotedString('"')
 lparen = Literal("(").suppress()
 rparen = Literal(")").suppress()
-op = oneOf(" ".join(op_map.keys())).set_parse_action(
+op = one_of(" ".join(op_map.keys())).set_parse_action(
     lambda source, loc, toks: op_map[toks[0]]
 )
 
@@ -177,7 +177,7 @@ def resolve_func(source, loc, toks):
 # variables.
 func = Regex(r"(?<=\()[{}]+".format(alphanums + "_")).set_parse_action(resolve_func)
 
-higher_func = oneOf(" ".join(higher_func_map.keys())).set_parse_action(
+higher_func = one_of(" ".join(higher_func_map.keys())).set_parse_action(
     lambda source, loc, toks: higher_func_map[toks[0]]
 )