##// END OF EJS Templates
Merge pull request #1502 from minrk/pyflakes...
Fernando Perez -
r6447:d13bbaf3 merge
parent child Browse files
Show More
@@ -363,7 +363,7 b' class CommandLineConfigLoader(ConfigLoader):'
363 for sec,c in cfg.iteritems():
363 for sec,c in cfg.iteritems():
364 self.config[sec].update(c)
364 self.config[sec].update(c)
365 else:
365 else:
366 raise ValueError("Invalid flag: '%s'"%raw)
366 raise TypeError("Invalid flag: %r" % cfg)
367
367
368 # raw --identifier=value pattern
368 # raw --identifier=value pattern
369 # but *also* accept '-' as wordsep, for aliases
369 # but *also* accept '-' as wordsep, for aliases
@@ -937,11 +937,6 b' Currently the magic system has the following functions:\\n"""'
937 vsize = var.size
937 vsize = var.size
938 vbytes = vsize*var.itemsize
938 vbytes = vsize*var.itemsize
939 vdtype = var.dtype
939 vdtype = var.dtype
940 else:
941 # Numeric
942 vsize = Numeric.size(var)
943 vbytes = vsize*var.itemsize()
944 vdtype = var.typecode()
945
940
946 if vbytes < 100000:
941 if vbytes < 100000:
947 print aformat % (vshape,vsize,vdtype,vbytes)
942 print aformat % (vshape,vsize,vdtype,vbytes)
@@ -2321,7 +2316,7 b' Currently the magic system has the following functions:\\n"""'
2321 try:
2316 try:
2322 last_call[0] = self.shell.displayhook.prompt_count
2317 last_call[0] = self.shell.displayhook.prompt_count
2323 if not opts_prev:
2318 if not opts_prev:
2324 last_call[1] = parameter_s
2319 last_call[1] = args
2325 except:
2320 except:
2326 pass
2321 pass
2327
2322
@@ -171,4 +171,4 b' class ClusterManager(LoggingConfigurable):'
171
171
172 def stop_all_clusters(self):
172 def stop_all_clusters(self):
173 for p in self.profiles.keys():
173 for p in self.profiles.keys():
174 self.stop_cluster(profile)
174 self.stop_cluster(p)
@@ -26,7 +26,7 b' try:'
26 except:
26 except:
27 from IPython.utils.nested_context import nested
27 from IPython.utils.nested_context import nested
28
28
29 from IPython.core.error import TryNext
29 from IPython.core.error import TryNext, UsageError
30 from IPython.core.usage import interactive_usage, default_banner
30 from IPython.core.usage import interactive_usage, default_banner
31 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
31 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
32 from IPython.core.pylabtools import pylab_activate
32 from IPython.core.pylabtools import pylab_activate
@@ -512,7 +512,7 b' class TaskScheduler(SessionFactory):'
512 return False
512 return False
513 if job.targets:
513 if job.targets:
514 # check blacklist+targets for impossibility
514 # check blacklist+targets for impossibility
515 job.targets.difference_update(blacklist)
515 job.targets.difference_update(job.blacklist)
516 if not job.targets or not job.targets.intersection(self.targets):
516 if not job.targets or not job.targets.intersection(self.targets):
517 self.depending[msg_id] = job
517 self.depending[msg_id] = job
518 self.fail_unreachable(msg_id)
518 self.fail_unreachable(msg_id)
@@ -21,7 +21,9 b' from IPython.parallel import Client'
21 from IPython.parallel.apps.launcher import (LocalProcessLauncher,
21 from IPython.parallel.apps.launcher import (LocalProcessLauncher,
22 ipengine_cmd_argv,
22 ipengine_cmd_argv,
23 ipcontroller_cmd_argv,
23 ipcontroller_cmd_argv,
24 SIGKILL)
24 SIGKILL,
25 ProcessStateError,
26 )
25
27
26 # globals
28 # globals
27 launchers = []
29 launchers = []
@@ -191,10 +191,10 b' class PickleShareDB(collections.MutableMapping):'
191 return [self._normalized(p) for p in files if p.isfile()]
191 return [self._normalized(p) for p in files if p.isfile()]
192
192
193 def __iter__(self):
193 def __iter__(self):
194 return iter(keys)
194 return iter(self.keys())
195
195
196 def __len__(self):
196 def __len__(self):
197 return len(keys)
197 return len(self.keys())
198
198
199 def uncache(self,*items):
199 def uncache(self,*items):
200 """ Removes all, or specified items from cache
200 """ Removes all, or specified items from cache
@@ -24,6 +24,8 b' Authors:'
24 import sys
24 import sys
25 from unittest import TestCase
25 from unittest import TestCase
26
26
27 from nose import SkipTest
28
27 from IPython.utils.traitlets import (
29 from IPython.utils.traitlets import (
28 HasTraits, MetaHasTraits, TraitType, Any, CBytes,
30 HasTraits, MetaHasTraits, TraitType, Any, CBytes,
29 Int, Long, Integer, Float, Complex, Bytes, Unicode, TraitError,
31 Int, Long, Integer, Float, Complex, Bytes, Unicode, TraitError,
@@ -59,7 +59,7 b' class ClientCompleter(object):'
59 # Give the kernel up to 0.5s to respond
59 # Give the kernel up to 0.5s to respond
60 for i in range(5):
60 for i in range(5):
61 ident,rep = self.session.recv(self.socket)
61 ident,rep = self.session.recv(self.socket)
62 rep = Message(rep)
62 rep = session.Message(rep)
63 if rep is not None and rep.msg_type == 'complete_reply':
63 if rep is not None and rep.msg_type == 'complete_reply':
64 matches = rep.content.matches
64 matches = rep.content.matches
65 break
65 break
@@ -18,6 +18,7 b' import zmq'
18 import session
18 import session
19 import completer
19 import completer
20 from IPython.utils.localinterfaces import LOCALHOST
20 from IPython.utils.localinterfaces import LOCALHOST
21 from IPython.zmq.session import Message
21
22
22 #-----------------------------------------------------------------------------
23 #-----------------------------------------------------------------------------
23 # Classes and functions
24 # Classes and functions
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now