diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-26 00:13:50 -05:00
parent a5c09f9187
commit 1a878579fd
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/python/yap_kernel/yap_kernel.py
View File

@ -5,18 +5,8 @@ from ipykernel.ipkernel import IPythonKernel
import sys import sys
import signal import signal
import yap import yap
#import ipdb
import logging #ipdb,set_trace()
logger = logging.getLogger()
handler = logging.StreamHandler()
formatter = logging.Formatter(
'%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
handler.setFormatter(formatter)
logger.addHandler(handler)
logger.setLevel(logging.DEBUG)
logger.debug('often makes a very good meal of %s', 'visiting tourists')
kernel_json = { kernel_json = {
"argv": [sys.executable, "argv": [sys.executable,
@ -50,12 +40,7 @@ class YAPKernel(IPythonKernel):
'file_extension': '.yap', 'file_extension': '.yap',
} }
def init_yap(self, **kwargs):
def __init__(self, **kwargs):
super(YAPKernel, self).__init__( **kwargs)
_start_yap( **kwargs )
def _start_yap(self, **kwargs):
# Signal handlers are inherited by forked processes, and we can't easily # Signal handlers are inherited by forked processes, and we can't easily
# reset it from the subprocess. Since kernelapp ignores SIGINT except in # reset it from the subprocess. Since kernelapp ignores SIGINT except in
# message handlers, we need to temporarily reset the SIGINT handler here # message handlers, we need to temporarily reset the SIGINT handler here
@ -71,11 +56,16 @@ class YAPKernel(IPythonKernel):
finally: finally:
signal.signal(signal.SIGINT, sig) signal.signal(signal.SIGINT, sig)
def __init__(self, **kwargs):
super(YAPKernel, self).__init__( **kwargs)
self.init_yap( **kwargs )
self.shell.run_cell = self.yap_run_cell
def get_usage(self): def get_usage(self):
return "This is the YAP kernel." return "This is the YAP kernel."
def run_cell(self, s, store_history=False, silent=False, shell_futures=True): def yap_run_cell(self, s, store_history=False, silent=False, shell_futures=True):
if not self.q: if not self.q:
self.q = self.engine.query(s) self.q = self.engine.query(s)