Merge pull request #1502 from minrk/pyflakes

small changes in response to pyflakes pass

Only significant change: removes incomplete kernelstarter file, which shouldn't have been in the repo at all.

closes  #1499

IPython/config/loader.py

@@ -363,7 +363,7 b' class CommandLineConfigLoader(ConfigLoader):'
             for sec,c in cfg.iteritems():
                 self.config[sec].update(c)
         else:
-            raise ValueError("Invalid flag: '%s'"%raw)
+            raise TypeError("Invalid flag: %r" % cfg)
 
 # raw --identifier=value pattern
 # but *also* accept '-' as wordsep, for aliases

IPython/core/magic.py

@@ -937,11 +937,6 b' Currently the magic system has the following functions:\\n"""'
                     vsize  = var.size
                     vbytes = vsize*var.itemsize
                     vdtype = var.dtype
-                else:
-                    # Numeric
-                    vsize  = Numeric.size(var)
-                    vbytes = vsize*var.itemsize()
-                    vdtype = var.typecode()
 
                 if vbytes < 100000:
                     print aformat % (vshape,vsize,vdtype,vbytes)
@@ -2321,7 +2316,7 b' Currently the magic system has the following functions:\\n"""'
         try:
             last_call[0] = self.shell.displayhook.prompt_count
             if not opts_prev:
-                last_call[1] = parameter_s
+                last_call[1] = args
         except:
             pass
 

IPython/frontend/html/notebook/clustermanager.py

@@ -171,4 +171,4 b' class ClusterManager(LoggingConfigurable):'
 
     def stop_all_clusters(self):
         for p in self.profiles.keys():
-            self.stop_cluster(profile)
+            self.stop_cluster(p)

IPython/frontend/terminal/interactiveshell.py

@@ -26,7 +26,7 b' try:'
 except:
     from IPython.utils.nested_context import nested
 
-from IPython.core.error import TryNext
+from IPython.core.error import TryNext, UsageError
 from IPython.core.usage import interactive_usage, default_banner
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
 from IPython.core.pylabtools import pylab_activate

IPython/parallel/controller/scheduler.py

@@ -512,7 +512,7 b' class TaskScheduler(SessionFactory):'
                         return False
                 if job.targets:
                     # check blacklist+targets for impossibility
-                    job.targets.difference_update(blacklist)
+                    job.targets.difference_update(job.blacklist)
                     if not job.targets or not job.targets.intersection(self.targets):
                         self.depending[msg_id] = job
                         self.fail_unreachable(msg_id)

IPython/parallel/tests/__init__.py

@@ -21,7 +21,9 b' from IPython.parallel import Client'
 from IPython.parallel.apps.launcher import (LocalProcessLauncher,
                                                   ipengine_cmd_argv,
                                                   ipcontroller_cmd_argv,
-                                                  SIGKILL)
+                                                  SIGKILL,
+                                                  ProcessStateError,
+)
 
 # globals
 launchers = []

IPython/utils/pickleshare.py

@@ -191,10 +191,10 b' class PickleShareDB(collections.MutableMapping):'
         return [self._normalized(p) for p in files if p.isfile()]
 
     def __iter__(self):
-        return iter(keys)
+        return iter(self.keys())
 
     def __len__(self):
-        return len(keys)
+        return len(self.keys())
 
     def uncache(self,*items):
         """ Removes all, or specified items from cache

IPython/utils/tests/test_traitlets.py

@@ -24,6 +24,8 b' Authors:'
 import sys
 from unittest import TestCase
 
+from nose import SkipTest
+
 from IPython.utils.traitlets import (
     HasTraits, MetaHasTraits, TraitType, Any, CBytes,
     Int, Long, Integer, Float, Complex, Bytes, Unicode, TraitError,

IPython/zmq/completer.py

@@ -59,7 +59,7 b' class ClientCompleter(object):'
         # Give the kernel up to 0.5s to respond
         for i in range(5):
             ident,rep = self.session.recv(self.socket)
-            rep = Message(rep)
+            rep = session.Message(rep)
             if rep is not None and rep.msg_type == 'complete_reply':
                 matches = rep.content.matches
                 break

IPython/zmq/frontend.py

@@ -18,6 +18,7 b' import zmq'
 import session
 import completer
 from IPython.utils.localinterfaces import LOCALHOST
+from IPython.zmq.session import Message
 
 #-----------------------------------------------------------------------------
 # Classes and functions