From a629c118ea7e7269a679e0c4c1a631d450b72210 Mon Sep 17 00:00:00 2001 From: Matti Pastell Date: Mon, 28 Aug 2017 11:51:19 +0300 Subject: [PATCH] Fix ptangle, fixes #79 --- pweave/pweb.py | 12 ++++++------ tests/publish/publish_test_REF.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pweave/pweb.py b/pweave/pweb.py index 93ceb0d..6f294b6 100644 --- a/pweave/pweb.py +++ b/pweave/pweb.py @@ -36,6 +36,8 @@ def __init__(self, source, doctype = None, *, informat = None, kernel = "python3 self.figdir = figdir self.doctype = doctype self.sink = None + self.kernel = None + self.language = None if mimetype is None: self.mimetype = MimeTypes.guess_mimetype(self.source) @@ -50,10 +52,7 @@ def __init__(self, source, doctype = None, *, informat = None, kernel = "python3 self.file_ext = None self.output = output - - if kernel is not None: - self.setkernel(kernel) - + self.setkernel(kernel) self._setwd() #Init variables not set using the constructor @@ -80,7 +79,8 @@ def _setwd(self): def setkernel(self, kernel): """Set the kernel for jupyter_client""" self.kernel = kernel - self.language = kernelspec.get_kernel_spec(kernel).language + if kernel is not None: + self.language = kernelspec.get_kernel_spec(kernel).language def getformat(self): """Get current format dictionary. See: http://mpastell.com/pweave/customizing.html""" @@ -205,7 +205,7 @@ def tangle(self): x['content'] = "".join([main, x['content']]) code = [x['content'] for x in code] f = open(target, 'w') - f.write('\n'.join(code)) + f.write('\n'.join(code) + "\n") f.close() print('Tangled code from {src} to {dst}'.format(src=self.source, dst=target)) diff --git a/tests/publish/publish_test_REF.py b/tests/publish/publish_test_REF.py index def605f..c53661f 100644 --- a/tests/publish/publish_test_REF.py +++ b/tests/publish/publish_test_REF.py @@ -43,4 +43,4 @@ def impz(b,a=1): a = 12 b = 10 -print(a+b) \ No newline at end of file +print(a+b)