alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modernize some Python code

Browse source 
Since we now require Python 3.6, we can use f-strings instead of
format() to make the code more readable.

* doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org,
doc/org/tut21.org, doc/org/tut24.org, doc/org/tut90.org,
python/spot/__init__.py, python/spot/jupyter.py, tests/python/acc.py,
tests/python/acc_cond.ipynb, tests/python/complement_semidet.py,
tests/python/decompose.ipynb, tests/python/formulas.ipynb,
tests/python/highlighting.ipynb, tests/python/ipnbdoctest.py,
tests/python/ltlf.py, tests/python/parity.ipynb,
tests/python/product.ipynb, tests/python/relabel.py,
tests/python/satmin.ipynb, tests/python/stutter-inv.ipynb,
tests/python/twagraph-internals.ipynb, tests/python/zlktree.ipynb: Use
f-strings.
This commit is contained in:
Alexandre Duret-Lutz 2024-03-26 20:35:10 +01:00
parent df44f7a5c2
commit 7ac570fa3f
23 changed files with 292 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/org/tut90.org
View file

@ -108,12 +108,12 @@ import spot
aut1 = spot.make_twa_graph()
ap1a = aut1.register_ap("a")
ap1b = aut1.register_ap("b")
print("aut1: a={} b={}".format(ap1a, ap1b))
print(f"aut1: a={ap1a} b={ap1b}")
aut2 = spot.make_twa_graph()
ap2c = aut2.register_ap("c")
ap2b = aut2.register_ap("b")
ap2a = aut2.register_ap("a")
print("aut1: a={} b={} c={}".format(ap2a, ap2b, ap2c))
print(f"aut1: a={ap2a} b={ap2b} c={ap2c}")
#+END_SRC
#+RESULTS:
@ -271,7 +271,7 @@ all transition that belong to a certain acceptance set.
self.set.add((src, guard, dst))
def str_trans(self, src, guard, dst):
f = spot.bdd_format_formula(self.dict, guard)
return "({},{},{})".format(src, f, dst)
return f"({src},{f},{dst})"
def __str__(self):
return '{' + ",".join([ self.str_trans(*t) for t in self.set ]) + '}'
@ -353,7 +353,7 @@ automaton registers its variables.
self.set.add((src, guard, dest))
def str_trans(self, src, guard, dest):
f = spot.bdd_format_formula(self.dict, guard)
return "({},{},{})".format(src, f, dest)
return f"({src},{f},{dest})"
def __str__(self):
return '{' + ",".join([ self.str_trans(*t) for t in self.set ]) + '}'