33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From bcb9684d0cdb56e4924da6a7dc36d74bd8ef5faf Mon Sep 17 00:00:00 2001
|
|
From: Martin Pitt <martin.pitt@ubuntu.com>
|
|
Date: Wed, 30 Nov 2016 09:20:15 +0100
|
|
Subject: [PATCH] parse_hwdb: fix to work with pyparsing 2.1.10
|
|
|
|
pyparsing 2.1.10 fixed the handling of LineStart to really just apply to line
|
|
starts and not ignore whitespace and comments any more. Adjust EMPTYLINE to
|
|
this.
|
|
|
|
Many thanks to Paul McGuire for pointing this out!
|
|
|
|
(cherry picked from commit f644a6da7a6f11d20116842e2ce1c7e9c0b0ad64)
|
|
---
|
|
hwdb/parse_hwdb.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
|
|
index 5d4c5ea64d..5856d12af7 100755
|
|
--- a/hwdb/parse_hwdb.py
|
|
+++ b/hwdb/parse_hwdb.py
|
|
@@ -56,7 +56,7 @@ except ImportError:
|
|
lru_cache = lambda: (lambda f: f)
|
|
|
|
EOL = LineEnd().suppress()
|
|
-EMPTYLINE = LineStart() + LineEnd()
|
|
+EMPTYLINE = LineEnd()
|
|
COMMENTLINE = pythonStyleComment + EOL
|
|
INTEGER = Word(nums)
|
|
REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER))
|
|
--
|
|
2.9.3
|
|
|