]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: make parse-hwdb compatible with older pyparsing versions
authorFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 19 Oct 2022 19:16:04 +0000 (21:16 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 19 Oct 2022 20:46:30 +0000 (22:46 +0200)
Follow-up to e77fed207a41a77f88853a89a8408fbfa9a17ddd.

hwdb.d/parse_hwdb.py

index 61932fb0185b766456ee3534424eccd7c5abca64..899d8f607263fb6b32854271f37a48617b254ad5 100755 (executable)
@@ -33,11 +33,22 @@ try:
                            OneOrMore, Combine, Or, Optional, Suppress, Group,
                            nums, alphanums, printables,
                            stringEnd, pythonStyleComment,
-                           ParseBaseException, __diag__)
+                           ParseBaseException)
 except ImportError:
     print('pyparsing is not available')
     sys.exit(77)
 
+try:
+    from pyparsing import __diag__
+
+    __diag__.warn_multiple_tokens_in_named_alternation = True
+    __diag__.warn_ungrouped_named_tokens_in_collection = True
+    __diag__.warn_name_set_on_empty_Forward = True
+    __diag__.warn_on_multiple_string_args_to_oneof = True
+    __diag__.enable_debug_on_named_expressions = True
+except ImportError:
+    pass
+
 try:
     from evdev.ecodes import ecodes
 except ImportError:
@@ -50,12 +61,6 @@ except ImportError:
     # don't do caching on old python
     lru_cache = lambda: (lambda f: f)
 
-__diag__.warn_multiple_tokens_in_named_alternation = True
-__diag__.warn_ungrouped_named_tokens_in_collection = True
-__diag__.warn_name_set_on_empty_Forward = True
-__diag__.warn_on_multiple_string_args_to_oneof = True
-__diag__.enable_debug_on_named_expressions = True
-
 EOL = LineEnd().suppress()
 EMPTYLINE = LineEnd()
 COMMENTLINE = pythonStyleComment + EOL