From e42bc23d062e7ea35cc4b143c649bd76995ab479 2009-02-20 04:14:05
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-02-20 04:14:05
Subject: [PATCH] Messing with newlines.

---

diff --git a/IPython/kernel/engineservice.py b/IPython/kernel/engineservice.py
index 26577f2..657eda8 100644
--- a/IPython/kernel/engineservice.py
+++ b/IPython/kernel/engineservice.py
@@ -400,6 +400,7 @@ class EngineService(object, service.Service):
     
     # The IEngine methods.  See the interface for documentation.
     
+    @profile
     def execute(self, lines):
         msg = {'engineid':self.id,
                'method':'execute',
@@ -693,7 +694,7 @@ class QueuedEngine(object):
     @queue
     def execute(self, lines):
         pass
-
+    
     @queue
     def push(self, namespace):
         pass      
diff --git a/IPython/kernel/multiengine.py b/IPython/kernel/multiengine.py
index 4d1fe6c..b42b3b6 100644
--- a/IPython/kernel/multiengine.py
+++ b/IPython/kernel/multiengine.py
@@ -552,6 +552,7 @@ class SynchronousMultiEngine(PendingDeferredManager):
     # Decorated pending deferred methods
     #---------------------------------------------------------------------------
     
+    @profile
     @two_phase
     def execute(self, lines, targets='all'):
         d = self.multiengine.execute(lines, targets)
diff --git a/IPython/kernel/multienginefc.py b/IPython/kernel/multienginefc.py
index ec51e47..30de28d 100644
--- a/IPython/kernel/multienginefc.py
+++ b/IPython/kernel/multienginefc.py
@@ -131,7 +131,7 @@ class FCSynchronousMultiEngineFromMultiEngine(Referenceable):
     def _addDeferredIDCallback(self, did, callback, *args, **kwargs):
         self._deferredIDCallbacks[did] = (callback, args, kwargs)
         return did
-        
+    
     #---------------------------------------------------------------------------
     # IEngineMultiplexer related methods
     #---------------------------------------------------------------------------
@@ -346,7 +346,7 @@ class FCFullSynchronousMultiEngineClient(object):
     #---------------------------------------------------------------------------
     # IEngineMultiplexer related methods
     #---------------------------------------------------------------------------
-        
+    
     def execute(self, lines, targets='all', block=True):
         d = self.remote_reference.callRemote('execute', lines, targets, block)
         d.addCallback(self.unpackage)