From 40ad790795ba9bb9114f44faa1e42340525a4e5d Mon Sep 17 00:00:00 2001
From: David Woods <david@birnamdesigns.com>
Date: Thu, 4 Jun 2020 16:45:38 +0000
Subject: [PATCH 1/2] initial commit for .gitignore, some updates to jython
 kernel

---
 .gitignore       | 138 +++++++++++++++++++++++++++++++++++++++++++++++
 jython_kernel.py |   5 +-
 2 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a81c8ee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
diff --git a/jython_kernel.py b/jython_kernel.py
index f23739e..75c6fae 100644
--- a/jython_kernel.py
+++ b/jython_kernel.py
@@ -1,5 +1,5 @@
 from ipykernel.kernelbase import Kernel
-from IPython.utils.path import locate_profile
+from IPython.paths import locate_profile
 from pexpect import replwrap,EOF,spawn
 import signal
 import re
@@ -43,7 +43,6 @@ def _start_jython(self):
             self._child  = spawn(self._executable,timeout = None)
             self._child.waitnoecho(True)
             self._child.expect(u">>> ")
-            self._child.expect(u">>> ")
             self._child.setwinsize(600,400)
         finally:
             signal.signal(signal.SIGINT, sig)
@@ -157,7 +156,7 @@ def jyrepl(self,code,timeout=None):
             self._child.sendline(line)
             now_prompt=self._child.expect_exact([u">>> ",u"... "])
             if len(self._child.before.splitlines())>1:    out+='\n'.join(self._child.before.splitlines()[1:])+'\n'
-            now_prompt=self._child.expect_exact([u">>> ",u"... "])
+            # now_prompt=self._child.expect_exact([u">>> ",u"... "])
         return out
 
 if __name__ == '__main__':

From 424f0fa9cfb17d5975675b40d247b65e035cd6ea Mon Sep 17 00:00:00 2001
From: David Woods <david@birnamdesigns.com>
Date: Thu, 4 Jun 2020 17:18:35 +0000
Subject: [PATCH 2/2] fixed bad output error

---
 jython_kernel.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jython_kernel.py b/jython_kernel.py
index 75c6fae..85eb6d4 100644
--- a/jython_kernel.py
+++ b/jython_kernel.py
@@ -155,8 +155,7 @@ def jyrepl(self,code,timeout=None):
         for line in code.splitlines():
             self._child.sendline(line)
             now_prompt=self._child.expect_exact([u">>> ",u"... "])
-            if len(self._child.before.splitlines())>1:    out+='\n'.join(self._child.before.splitlines()[1:])+'\n'
-            # now_prompt=self._child.expect_exact([u">>> ",u"... "])
+            if len(self._child.before.splitlines())>1:    out+='\n'.join(self._child.before.decode('UTF-8').splitlines()[1:])+'\n'
         return out
 
 if __name__ == '__main__':