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

Make all python code compatible with Python 2.x and Python 3.x.

Browse source 
* wrap/python/buddy.i (__le__, __lt__, __eq__, __ne__, __ge__
__gt__): New operators for bdd.
* wrap/python/spot.i (__le__, __lt__, __eq__, __ne__, __ge__
__gt__, __hash__): New operators for formula.
(nl_cout, nl_cerr): New functions.
* wrap/python/tests/bddnqueen.py,
wrap/python/tests/interdep.py, wrap/python/tests/ltl2tgba.py,
wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py,
wrap/python/tests/minato.py, wrap/python/tests/modgray.py: Adjust
to the new print syntax by using sys.output.write() or nl_cout()
instead.
* wrap/python/tests/optionmap.py: Remove all print calls.
* wrap/python/ajax/spot.in: Massive adjustments in order to work
with both Python 2 and 3.  In python 3, reopening stdout as
unbuffered requires it to be open as binary, which in turns
requires any string output to be encoded manually.  BaseHTTPServer
and CGIHTTPServer have been merged into http.server, so we have
to try two different import syntaxes.  execfile no longer exists,
so it has to be emulated.
This also fixes two bugs where the script would segfault on
empty input, or when calling Tau03 on automata with less then
one acceptance conditions.
This commit is contained in:
Alexandre Duret-Lutz 2012-02-25 13:36:29 +01:00
parent 5e77b2498a
commit 61127a3fd5
12 changed files with 262 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

15
wrap/python/tests/ltlsimple.py
View file

@ -1,8 +1,8 @@
# -*- mode: python; coding: iso-8859-1 -*-
# Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
# This file is part of Spot, a model checking library.
@ -23,6 +23,7 @@
# 02111-1307, USA.
import spot
import sys
e = spot.default_environment.instance()
@ -42,18 +43,18 @@ op2 = spot.multop.instance(spot.multop.And, op, c)
# suppressed, so we don't attempt to reuse it elsewhere.
del op, c
print 'op2 =', op2
sys.stdout.write('op2 = %s\n' % str(op2))
op3 = spot.multop.instance(spot.multop.And, b,
spot.multop.instance(spot.multop.And, c2, a))
spot.multop.instance(spot.multop.And, c2, a))
del a, b, c2
print 'op3 =', op3
sys.stdout.write('op3 = %s\n' % str(op3))
assert op2 == op3
op4 = spot.multop.instance(spot.multop.Or, op2, op3)
print 'op4 =', op4
sys.stdout.write('op4 = %s\n' % str(op4))
assert op4 == op2
del op2, op3