aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2021-02-24 11:14:42 +0100
committerMarkus Armbruster <armbru@redhat.com>2021-03-05 15:40:50 +0100
commit0e92a19b8c3b269dee377b76898c8bd7cadc1273 (patch)
tree413de170f72a15dd170e2c0d3454ced79850d49b /scripts
parenta0e61807a3492b57f10d78e97fed97a0d3b21933 (diff)
qapi: Fix parse errors for removal of null from schema language
Commit 9d55380b5a "qapi: Remove null from schema language" (v4.2.0) neglected to update two error messages. Do that now. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20210224101442.1837475-1-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi/parser.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index e7b9d670ad..116afe549a 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -236,9 +236,9 @@ class QAPISchemaParser:
if self.tok == ']':
self.accept()
return expr
- if self.tok not in "{['tfn":
+ if self.tok not in "{['tf":
raise QAPIParseError(
- self, "expected '{', '[', ']', string, boolean or 'null'")
+ self, "expected '{', '[', ']', string, or boolean")
while True:
expr.append(self.get_expr(True))
if self.tok == ']':
@@ -257,12 +257,12 @@ class QAPISchemaParser:
elif self.tok == '[':
self.accept()
expr = self.get_values()
- elif self.tok in "'tfn":
+ elif self.tok in "'tf":
expr = self.val
self.accept()
else:
raise QAPIParseError(
- self, "expected '{', '[', string, boolean or 'null'")
+ self, "expected '{', '[', string, or boolean")
return expr
def get_doc(self, info):