##// END OF EJS Templates
Fixing small bug in activate....
Brian Granger -
Show More
@@ -2294,6 +2294,8 b' class InteractiveShell(Component, Magic):'
2294 def get_component(self, name=None, klass=None):
2294 def get_component(self, name=None, klass=None):
2295 """Fetch a component by name and klass in my tree."""
2295 """Fetch a component by name and klass in my tree."""
2296 c = Component.get_instances(root=self, name=name, klass=klass)
2296 c = Component.get_instances(root=self, name=name, klass=klass)
2297 if len(c) == 0:
2298 return None
2297 if len(c) == 1:
2299 if len(c) == 1:
2298 return c[0]
2300 return c[0]
2299 else:
2301 else:
@@ -269,8 +269,12 b' class InteractiveMultiEngineClient(object):'
269 print "The IPython parallel magics (%result, %px, %autopx) only work within IPython."
269 print "The IPython parallel magics (%result, %px, %autopx) only work within IPython."
270 else:
270 else:
271 pmagic = ip.get_component('parallel_magic')
271 pmagic = ip.get_component('parallel_magic')
272 pmagic.active_multiengine_client = self
272 if pmagic is not None:
273
273 pmagic.active_multiengine_client = self
274 else:
275 print "You must first load the parallelmagic extension " \
276 "by doing '%load_ext parallelmagic'"
277
274 def __setitem__(self, key, value):
278 def __setitem__(self, key, value):
275 """Add a dictionary interface for pushing/pulling.
279 """Add a dictionary interface for pushing/pulling.
276
280
General Comments 0
You need to be logged in to leave comments. Login now