Mesa (master): intel/genxml: Make assert in gen_pack_header print a message.

Kenneth Graunke kwg at kemper.freedesktop.org
Tue May 8 06:07:15 UTC 2018


Module: Mesa
Branch: master
Commit: 33906eeaca917506cfa4297913c386121357531e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33906eeaca917506cfa4297913c386121357531e

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon May  7 11:23:27 2018 -0700

intel/genxml: Make assert in gen_pack_header print a message.

Python's assert can take both a condition and a string, which will cause
it to print the string if the assertion trips.  (You can't use parens as
that creates a tuple.)  Doing "condition and string" works in C, but
doesn't have the desired effect in Python.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/genxml/gen_pack_header.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py
index 6a4c8033a7..4bce425d12 100644
--- a/src/intel/genxml/gen_pack_header.py
+++ b/src/intel/genxml/gen_pack_header.py
@@ -220,7 +220,7 @@ def num_from_str(num_str):
     if num_str.lower().startswith('0x'):
         return int(num_str, base=16)
     else:
-        assert(not num_str.startswith('0') and 'octals numbers not allowed')
+        assert not num_str.startswith('0'), 'octals numbers not allowed'
         return int(num_str)
 
 class Field(object):




More information about the mesa-commit mailing list