<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b9c1e3f9a7dbf536d6e2c8be17b522cc34bdf5d0">https://github.com/macports/macports-ports/commit/b9c1e3f9a7dbf536d6e2c8be17b522cc34bdf5d0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b9c1e3f9a7dbf536d6e2c8be17b522cc34bdf5d0
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Aug 29 22:24:25 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-qtconsole: update to 5.3.2
</span>---
python/py-qtconsole/Portfile | 8 +-
python/py-spyder/files/patch-ipython.diff | 16 +--
.../py-spyder/files/patch-spyder_app_start.py.diff | 18 ++--
.../files/patch-spyder_config_base.py.diff | 109 ++++++++++++---------
.../files/patch-spyder_utils_programs.py.diff | 22 ++---
5 files changed, 92 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qtconsole/Portfile b/python/py-qtconsole/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a21186b36a..a67fc155c34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qtconsole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qtconsole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-qtconsole
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.3.2
</span> revision 0
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description {*}${description}
</span>
homepage https://jupyter.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 475c3136d3ecc86a6ea762ef0246475a1158ac63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e3520fdc75e46abc4cc6cffeca16fa2652754109b8ae839fa28e27d1eba5625 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 430258
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8a17835f244e05dbef34f76c3a4887ed95a0e4c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8eadf012e83ab018295803c247c6ab7eacd3d5ab1e1d88a0f37fdcfdab9295a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 430792
</span>
if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-ipython.diff b/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a041975cdb4..7529163f456 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-ipython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,11 @@
</span> --- spyder/dependencies.py.orig 2022-04-03 11:16:04.000000000 -0400
+++ spyder/dependencies.py 2022-04-03 11:16:19.000000000 -0400
@@ -39,7 +39,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # None for pynsist install for now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (check way to add dist.info/egg.info from packages without wheels available)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IPYTHON_REQVER = ">=7.31.1;<8.0.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IPYTHON_REQVER = ">=7.31.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JEDI_REQVER = '>=0.17.2;<0.19.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JELLYFISH_REQVER = '>=0.7'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JSONSCHEMA_REQVER = '>=3.2.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # None for pynsist install for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (check way to add dist.info/egg.info from packages without wheels available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IPYTHON_REQVER = ">=7.31.1;<8.0.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IPYTHON_REQVER = ">=7.31.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JEDI_REQVER = '>=0.17.2;<0.19.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JELLYFISH_REQVER = '>=0.7'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JSONSCHEMA_REQVER = '>=3.2.0'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_start.py.diff b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f5e0c5184e2..7c224292aa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> --- spyder/app/start.py.orig 2021-09-02 00:24:22.000000000 -0400
+++ spyder/app/start.py 2021-09-04 13:44:54.000000000 -0400
@@ -40,6 +40,9 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.environ['LANG'] = 'en_US.UTF-8'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Local imports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.app.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.config.base import (get_conf_path, running_in_mac_app,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.environ['LANG'] = 'en_US.UTF-8'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Local imports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.config.base import (get_conf_path, running_in_mac_app,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_config_base.py.diff b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d8d729bc958..11d31a423ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +1,60 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2022-03-30 18:54:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2022-04-03 11:02:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,23 +132,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #==============================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def get_conf_subfolder():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return the configuration subfolder for different ooperating systems."""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # packagers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # packagers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # MacPorts: we allow multiple Python 2.x or 3.x versions side-by-side;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # keep preferences separate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.version_info[0], sys.version_info[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If running a development/beta version, save config in a separate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory to avoid wiping or contaiminating the user's saved stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2022-08-29 22:09:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2022-08-29 22:15:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,29 +132,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #==============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_conf_subfolder():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Return the configuration subfolder for different ooperating systems."""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # packagers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if PY3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # If running a development/beta version, save config in a separate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # directory to avoid wiping or contaiminating the user's saved stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if use_dev_config_dir():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUBFOLDER = SUBFOLDER + '-dev'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # Spyder settings dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # NOTE: During the 2.x.x series this dir was named .spyder2, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # since 3.0+ we've reverted back to use .spyder to simplify major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # updates in version (required when we change APIs by Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # packagers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # We can't have PY2 and PY3 settings in the same dir because:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # 1. This leads to ugly crashes and freezes (e.g. by trying to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # embed a PY2 interpreter in PY3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # 2. We need to save the list of installed modules (for code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # completion) separately for each version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if PY3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # If running a development/beta version, save config in a separate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # directory to avoid wiping or contaiminating the user's saved stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if use_dev_config_dir():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## SUBFOLDER = SUBFOLDER + '-dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MacPorts: we allow multiple Python 2.x or 3.x versions side-by-side;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # keep preferences separate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.version_info[0], sys.version_info[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return SUBFOLDER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_utils_programs.py.diff b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 06512e64a2a..562ced6779d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> --- spyder/utils/programs.py.orig 2022-03-30 18:54:18.000000000 -0400
+++ spyder/utils/programs.py 2022-04-03 11:02:06.000000000 -0400
@@ -126,6 +126,11 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- abspath = osp.join(path, basename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return abspath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abspath = "@@APPS_DIR@@/" + basename + ".app/Contents/MacOS/" + basename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return abspath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def find_program(basename):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abspath = osp.join(path, basename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return abspath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abspath = "@@APPS_DIR@@/" + basename + ".app/Contents/MacOS/" + basename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if osp.isfile(abspath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return abspath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def find_program(basename):
</span></pre><pre style='margin:0'>
</pre>