IDL branding; check for IDL before falling back on GDL

Author: Luke Stagner

gdl_kernel.py renamed to idl_kernel.py

@@ -14,10 +14,10 @@
 
 version_pat = re.compile(r'Version (\d+(\.\d+)+)')
 
-class GDLKernel(Kernel):
-    implementation = 'gdl_kernel'
+class IDLKernel(Kernel):
+    implementation = 'IDL_kernel'
     implementation_version = __version__
-    language = 'GDL'
+    language = 'IDL'
     @property
     def language_version(self):
         m = version_pat.search(self.banner)
@@ -27,7 +27,10 @@ def language_version(self):
     @property
     def banner(self):
         if self._banner is None:
-            self._banner = check_output(['gdl', '--version']).decode('utf-8')
+            try:
+                self._banner = check_output(['idl', '-e "" ']).decode('utf-8')
+            except:
+                self._banner = check_output(['gdl', '--version']).decode('utf-8')
         return self._banner
 
     def __init__(self, **kwargs):
@@ -38,11 +41,14 @@ def __init__(self, **kwargs):
         # so that bash and its children are interruptible.
         sig = signal.signal(signal.SIGINT, signal.SIG_DFL)
         try:
-            self.gdlwrapper = replwrap.REPLWrapper("gdl",u"GDL> ",None)
-            self.gdlwrapper.run_command("!quiet=1 & defsysv,'!inline',0".rstrip(), timeout=None)
+            self.idlwrapper = replwrap.REPLWrapper("idl",u"IDL> ",None)
+        except:
+            self.idlwrapper = replwrap.REPLWrapper("gdl",u"GDL> ",None)
         finally:
             signal.signal(signal.SIGINT, sig)
 
+        self.idlwrapper.run_command("!quiet=1 & defsysv,'!inline',0".rstrip(), timeout=None)
+
     def do_execute(self, code, silent, store_history=True, user_expressions=None,
                    allow_stdin=False):
         if not code.strip():
@@ -81,7 +87,7 @@ def do_execute(self, code, silent, store_history=True, user_expressions=None,
         try:
             tfile.file.write(code.rstrip()+postcall.rstrip())
             tfile.file.close()
-            output = self.gdlwrapper.run_command(".run "+tfile.name, timeout=None)
+            output = self.idlwrapper.run_command(".run "+tfile.name, timeout=None)
 
             # Publish images (only one for now)
             images = [open(imgfile, 'rb').read() for imgfile in glob("%s/__fig.png" % plot_dir)]
@@ -94,10 +100,10 @@ def do_execute(self, code, silent, store_history=True, user_expressions=None,
             for data in display_data:
                 self.send_response(self.iopub_socket, 'display_data',{'data':data,'metadata':{'image/png':{'width':683,'height':384}}})
         except KeyboardInterrupt:
-            self.gdlwrapper.child.sendintr()
+            self.idlwrapper.child.sendintr()
             interrupted = True
-            self.gdlwrapper._expect_prompt()
-            output = self.gdlwrapper.child.before
+            self.idlwrapper._expect_prompt()
+            output = self.idlwrapper.child.before
         finally:
             tfile.close()
             rmtree(plot_dir)
@@ -122,9 +128,9 @@ def do_execute(self, code, silent, store_history=True, user_expressions=None,
                     'payloads': [], 'user_expressions': {}}
 
     def do_shutdown(self, restart):
-        self.gdlwrapper.child.kill(signal.SIGKILL)
+        self.idlwrapper.child.kill(signal.SIGKILL)
         return {'status':'ok', 'restart':restart}
 
 if __name__ == '__main__':
     from IPython.kernel.zmq.kernelapp import IPKernelApp
-    IPKernelApp.launch_instance(kernel_class=GDLKernel)
+    IPKernelApp.launch_instance(kernel_class=IDLKernel)

kernelspec/kernel.json

@@ -1,5 +1,5 @@
-{"argv":["python","-m","gdl_kernel", "-f", "{connection_file}"],
- "display_name":"GDL",
- "language":"GDL",
- "codemirror_mode":"GDL"
+{"argv":["python","-m","idl_kernel", "-f", "{connection_file}"],
+ "display_name":"IDL",
+ "language":"IDL",
+ "codemirror_mode":"IDL"
 }

setup.py

@@ -6,7 +6,7 @@ class install_with_kernelspec(install):
     def run(self):
         install.run(self)
         from IPython.kernel.kernelspec import install_kernel_spec
-        install_kernel_spec('kernelspec', 'GDL', replace=True)
+        install_kernel_spec('kernelspec', 'IDL', replace=True)
 
 with open('README.md') as f:
     readme = f.read()
@@ -15,12 +15,12 @@ def run(self):
 if svem_flag in sys.argv:
     sys.argv.remove(svem_flag)
 
-setup(name='GDL_kernel',
+setup(name='IDL_kernel',
       version='0.1',
-      description='A GDL kernel for IPython',
+      description='A IDL kernel for IPython',
       long_description=readme,
       author='Luke Stagner',
-      py_modules=['gdl_kernel'],
+      py_modules=['idl_kernel'],
       cmdclass={'install': install_with_kernelspec},
       install_requires=['pexpect>=3.3'],
       classifiers = [