From d55d379c4077ba4d688fd800456802504f81bfba 2014-05-14 23:44:38
From: MinRK <benjaminrk@gmail.com>
Date: 2014-05-14 23:44:38
Subject: [PATCH] ensure load_connection_file works after self.session is created

only write to config if self.session hasn’t been instantiated,
otherwise write to session attrs.
---

diff --git a/IPython/kernel/connect.py b/IPython/kernel/connect.py
index 8e649cc..80a9416 100644
--- a/IPython/kernel/connect.py
+++ b/IPython/kernel/connect.py
@@ -505,10 +505,17 @@ class ConnectionFileMixin(Configurable):
             if getattr(self, name) == 0 and name in cfg:
                 # not overridden by config or cl_args
                 setattr(self, name, cfg[name])
+        
+        if self.session:
+            session = self.session
+        else:
+            session = self.config.Session
+        
         if 'key' in cfg:
-            self.config.Session.key = str_to_bytes(cfg['key'])
+            session.key = str_to_bytes(cfg['key'])
         if 'signature_scheme' in cfg:
-            self.config.Session.signature_scheme = cfg['signature_scheme']
+            session.signature_scheme = cfg['signature_scheme']
+
     #--------------------------------------------------------------------------
     # Creating connected sockets
     #--------------------------------------------------------------------------