Small fixes as per @certik's review.

IPython/core/magics/auto.py

@@ -109,7 +109,7 b' class AutoMagics(Magics):'
         else:
             arg = 'toggle'
 
-        if not arg in (0, 1, 2,'toggle'):
+        if not arg in (0, 1, 2, 'toggle'):
             error('Valid modes: (0->Off, 1->Smart, 2->Full')
             return
 

IPython/core/magics/basic.py

@@ -71,7 +71,7 b' class BasicMagics(Magics):'
             mode = parameter_s.split()[0][1:]
             if mode == 'rest':
                 rest_docs = []
-        except:
+        except IndexError:
             pass
 
         magic_docs = []

IPython/core/magics/code.py

@@ -249,7 +249,7 b' class CodeMagics(Magics):'
                         filename = make_filename(args)
                         datafile = 1
                         warn('Could not find file where `%s` is defined.\n'
-                             'Opening a file named `%s`' % (args,filename))
+                             'Opening a file named `%s`' % (args, filename))
                     # Now, make sure we can actually read the source (if it was
                     # in a temp file it's gone by now).
                     if datafile:
@@ -259,8 +259,8 b' class CodeMagics(Magics):'
                         except IOError:
                             filename = make_filename(args)
                             if filename is None:
-                                warn('The file `%s` where `%s` was defined cannot '
-                                     'be read.' % (filename,data))
+                                warn('The file `%s` where `%s` was defined '
+                                     'cannot be read.' % (filename, data))
                                 return
                     use_temp = False
 

IPython/core/magics/namespace.py

@@ -448,9 +448,9 b' class NamespaceMagics(Magics):'
                     vdtype = var.dtype
 
                 if vbytes < 100000:
-                    print aformat % (vshape,vsize,vdtype,vbytes)
+                    print aformat % (vshape, vsize, vdtype, vbytes)
                 else:
-                    print aformat % (vshape,vsize,vdtype,vbytes),
+                    print aformat % (vshape, vsize, vdtype, vbytes),
                     if vbytes < Mb:
                         print '(%s kb)' % (vbytes/kb,)
                     else:
@@ -463,7 +463,7 b' class NamespaceMagics(Magics):'
                                                'backslashreplace')
                 except:
                     vstr = "<object with id %d (str() failed)>" % id(var)
-                vstr = vstr.replace('\n','\\n')
+                vstr = vstr.replace('\n', '\\n')
                 if len(vstr) < 50:
                     print vstr
                 else:

IPython/core/magics/osm.py

@@ -316,7 +316,7 b' class OSMagics(Magics):'
 
                 if ps in bkms:
                     target = bkms[ps]
-                    print '(bookmark:%s) -> %s' % (ps,target)
+                    print '(bookmark:%s) -> %s' % (ps, target)
                     ps = target
                 else:
                     if 'b' in opts:
@@ -522,24 +522,24 b' class OSMagics(Magics):'
             .s (or .spstr): value as space-separated string.
         """
 
-        opts,args = self.parse_options(parameter_s,'lv')
+        opts,args = self.parse_options(parameter_s, 'lv')
         # Try to get a variable name and command to run
         try:
             # the variable name must be obtained from the parse_options
             # output, which uses shlex.split to strip options out.
-            var,_ = args.split('=',1)
+            var,_ = args.split('=', 1)
             var = var.strip()
             # But the command has to be extracted from the original input
             # parameter_s, not on what parse_options returns, to avoid the
             # quote stripping which shlex.split performs on it.
-            _,cmd = parameter_s.split('=',1)
+            _,cmd = parameter_s.split('=', 1)
         except ValueError:
             var,cmd = '',''
         # If all looks ok, proceed
         split = 'l' in opts
         out = self.shell.getoutput(cmd, split=split)
         if 'v' in opts:
-            print '%s ==\n%s' % (var,pformat(out))
+            print '%s ==\n%s' % (var, pformat(out))
         if var:
             self.shell.user_ns.update({var:out})
         else:

IPython/extensions/storemagic.py

@@ -127,7 +127,7 b' class StoreMagics(Magics):'
             vars = self.db.keys('autorestore/*')
             vars.sort()
             if vars:
-                size = max(map(len,vars))
+                size = max(map(len, vars))
             else:
                 size = 0
 
@@ -137,7 +137,7 b' class StoreMagics(Magics):'
             for var in vars:
                 justkey = os.path.basename(var)
                 # print 30 first characters from every var
-                print fmt % (justkey,repr(get(var,'<unavailable>'))[:50])
+                print fmt % (justkey, repr(get(var, '<unavailable>'))[:50])
 
         # default action - store the variable
         else:
@@ -145,17 +145,17 b' class StoreMagics(Magics):'
             if len(args) > 1 and args[1].startswith('>'):
                 fnam = os.path.expanduser(args[1].lstrip('>').lstrip())
                 if args[1].startswith('>>'):
-                    fil = open(fnam,'a')
+                    fil = open(fnam, 'a')
                 else:
-                    fil = open(fnam,'w')
+                    fil = open(fnam, 'w')
                 obj = ip.ev(args[0])
                 print "Writing '%s' (%s) to file '%s'." % (args[0],
                   obj.__class__.__name__, fnam)
 
 
-                if not isinstance (obj,basestring):
+                if not isinstance (obj, basestring):
                     from pprint import pprint
-                    pprint(obj,fil)
+                    pprint(obj, fil)
                 else:
                     fil.write(obj)
                     if not obj.endswith('\n'):