<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a895481a29f1a649796ce47cff9d3037abafbde">https://github.com/macports/macports-ports/commit/0a895481a29f1a649796ce47cff9d3037abafbde</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0a895481a29f1a649796ce47cff9d3037abafbde
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Fri Sep 7 13:59:39 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: refresh patches/reinplace
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove unused qt4 patches
</span><span style='display:block; white-space:pre;color:#404040;'> - add patches/reinplace for python-language-server
</span>---
python/py-spyder-devel/Portfile | 16 +++++++++++++---
.../py-spyder-devel/files/patch-scripts_spyder-qt4.diff | 8 --------
.../py-spyder-devel/files/patch-scripts_spyder3-qt4.diff | 8 --------
.../files/patch-spyder_app_mainwindow.py.diff | 6 +++---
.../py-spyder-devel/files/patch-spyder_app_start.py.diff | 6 +++---
.../files/patch-spyder_config_base.py.diff | 12 ++++++------
.../files/patch-spyder_config_main.py.diff | 11 +++++++++++
.../files/patch-spyder_plugins_editor_lsp_client.py.diff | 11 +++++++++++
...atch-spyder_plugins_editor_lsp_transport_main.py.diff | 11 +++++++++++
...-spyder_plugins_editor_lsp_transport_producer.py.diff | 11 +++++++++++
...y.diff => patch-spyder_plugins_editor_plugin.py.diff} | 6 +++---
.../files/patch-spyder_utils_programs.py.diff | 6 +++---
.../files/patch-spyder_utils_syntaxhighlighters.py.diff | 6 +++---
13 files changed, 78 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/Portfile b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dc5e81..bda0d58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,15 +99,25 @@ if {${name} ne ${subport}} {
</span> }
set WINPDB_BIN_NAME winpdb-${python.branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYLS_BIN_NAME pyls-${python.branch}
</span> patchfiles-append patch-spyder_config_base.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_plugin.py.diff \
</span> patch-spyder_app_start.py.diff \
patch-spyder_app_mainwindow.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_utils_programs.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_config_main.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_lsp_client.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_lsp_transport_main.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span>
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/spyder/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor/plugin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYLS_BIN_NAME@@|${PYLS_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/config/main.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor/lsp/client.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor/lsp/transport/main.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/plugins/editor/lsp/transport/producer.py
</span> reinplace "s|\"assistant\"|\"Assistant\"|g" \
${worksrcpath}/spyder/app/mainwindow.py
reinplace "s|\"linguist\"|\"Linguist\"|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff b/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6a9face..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/spyder.orig 2018-05-20 13:13:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/spyder 2018-05-20 13:13:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.app import start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff b/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e954934..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/spyder3.orig 2018-05-20 13:13:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/spyder3 2018-05-20 13:14:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! /usr/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyder.app import start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2866342..b281de1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/mainwindow.py.orig 2018-05-19 23:02:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py 2018-05-19 23:02:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,7 +219,7 @@
</span> return file_uri(osp.join(doc_path, python_chm[0]))
else:
vinf = sys.version_info
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_start.py.diff b/python/py-spyder-devel/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 87fbb05..42c3808 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/start.py.orig 2018-05-19 22:59:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/start.py 2018-05-19 22:59:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,9 @@
</span> except:
pass
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_config_base.py.diff b/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f0ab21..8789814 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2018-05-19 22:50:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2018-05-19 22:51:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import tempfile
</span>
# Local imports
+from spyder import __version__
from spyder.utils import encoding
from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
to_text_string, is_text_string)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,10 +84,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,10 +90,10 @@
</span> # since 3.0+ we've reverted back to use .spyder to simplify major
# updates in version (required when we change APIs by Linux
# packagers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span>
# We can't have PY2 and PY3 settings in the same dir because:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,8 +95,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,8 +101,14 @@
</span> # embed a PY2 interpreter in PY3)
# 2. We need to save the list of installed modules (for code
# completion) separately for each version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_config_main.py.diff b/python/py-spyder-devel/files/patch-spyder_config_main.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..baf70c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_config_main.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/main.py.orig 2018-09-08 13:07:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/main.py 2018-09-08 13:08:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -664,7 +664,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('lsp-server', {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python': {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'index': 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'cmd': 'pyls',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'cmd': '@@PYLS_BIN_NAME@@',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'args': '--host %(host)s --port %(port)s --tcp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'host': '127.0.0.1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'port': 2087,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..37500a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_client.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/lsp/client.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/lsp/client.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.utils.qthelpers import qapplication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app = qapplication(test_time=8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server_args_fmt = '--host %(host)s --port %(port)s --tcp'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- server_settings = {'host': '127.0.0.1', 'port': 2087, 'cmd': 'pyls'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ server_settings = {'host': '127.0.0.1', 'port': 2087, 'cmd': '@@PYLS_BIN_NAME@@'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lsp = LSPClient(app, server_args_fmt, server_settings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lsp.start()
</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-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aeca7c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_main.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/lsp/transport/main.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/lsp/transport/main.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="Initial current working directory used to "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "initialize ls-server")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.add_argument('--server',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default='pyls',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default='@@PYLS_BIN_NAME@@',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help='Instruction executed to start the language server')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.add_argument('--external-server',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action="store_true",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..167d4bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_lsp_transport_producer.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/lsp/transport/producer.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/lsp/transport/producer.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __init__(self, host='127.0.0.1', port=2087, workspace=getcwd(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_external_server=False, zmq_in_port=7000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zmq_out_port=7001, server='pyls', server_args=['--tcp']):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zmq_out_port=7001, server='@@PYLS_BIN_NAME@@', server_args=['--tcp']):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.req_status = {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.host = host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.port = port
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span>similarity index 53%
rename from python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff
rename to python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 923ca0f..18be814 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor_plugin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor.py.orig 2018-05-19 22:55:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor.py 2018-05-19 22:55:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor/plugin.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor/plugin.py 2018-10-20 11:54:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@
</span> save_breakpoints(filename, breakpoints)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 907fc59..e6524b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig 2018-05-19 23:42:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2018-05-19 23:42:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff b/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 988e935..03c84c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/syntaxhighlighters.py.orig 2018-05-19 22:47:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/syntaxhighlighters.py 2018-05-19 22:47:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,6 +191,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/syntaxhighlighters.py.orig 2018-09-07 10:34:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/syntaxhighlighters.py 2018-09-08 12:54:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,6 +196,10 @@
</span> if bold:
format.setFontWeight(QFont.Bold)
format.setFontItalic(italic)
</pre><pre style='margin:0'>
</pre>