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

python: remove the -nofastproxy option

Browse source 
This was introduced by b893b5597 to work around some IPython 2 issue
(https://github.com/ipython/ipython/issues/7003).

* python/Makefile.am (SWIGFLAGS): Remove obsolete option.
* python/spot/__init__.py: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2019-05-28 21:40:18 +02:00
parent bdd5a0b981
commit 428607df1a
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/Makefile.am
View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*- ## -*- coding: utf-8 -*-
## Copyright (C) 2010, 2011, 2013-2018 Laboratoire de Recherche ## Copyright (C) 2010, 2011, 2013-2019 Laboratoire de Recherche
## et Development de l'Epita (LRDE). ## et Development de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## 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
@ -25,12 +25,7 @@ AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \
$(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot $(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot
# Disable fastproxy, because IPython 2 bogusly ignores _repr_latex_ SWIGFLAGS = -c++ -python -py3 -O -MD
# when -fastproxy is used.
# https://github.com/ipython/ipython/issues/7003
# Once a fixed version of IPython hits Debian stable, we can remove
# this.
SWIGFLAGS = -c++ -python -py3 -O -nofastproxy -MD
EXTRA_DIST = buddy.i spot/impl.i spot/ltsmin.i spot/gen.i EXTRA_DIST = buddy.i spot/impl.i spot/ltsmin.i spot/gen.i
nobase_pyexec_PYTHON = \ nobase_pyexec_PYTHON = \

2
python/spot/__init__.py
View file

@ -1074,7 +1074,7 @@ def bdd_to_formula(b, dic=_bdd_dict):
def language_containment_checker(dic=_bdd_dict): def language_containment_checker(dic=_bdd_dict):
from spot.impl import language_containment_checker as c from spot.impl import language_containment_checker as c
c.contains = lambda this, a, b: c.contained(this, b, a) c.contains = lambda this, a, b: c.contained(this, b, a)
c.are_equivalent = c.equal c.are_equivalent = lambda this, a, b: c.equal(this, a, b)
return c(dic) return c(dic)
def mp_hierarchy_svg(cl=None): def mp_hierarchy_svg(cl=None):