Merge with trunk

IPython/Extensions/ipy_greedycompleter.py

@@ -66,7 +66,7 b' def attr_matches(self, text):'
     return res
 
 def main():
-    import readline
+    import IPython.rlineimpl as readline
     readline.set_completer_delims(" \n\t")
     # monkeypatch - the code will be folded to normal completer later on
     import IPython.completer

IPython/iplib.py

@@ -2209,7 +2209,7 b' class InteractiveShell(object,Magic):'
 
         try:
             code = self.compile(source,filename,symbol)
-        except (OverflowError, SyntaxError, ValueError, TypeError):
+        except (OverflowError, SyntaxError, ValueError, TypeError, MemoryError):
             # Case 1
             self.showsyntaxerror(filename)
             return None

IPython/platutils.py

@@ -14,6 +14,7 b' for your operation system, from platutils_PLATFORMNAME module.'
 
 import os
 import sys
+import warnings
 
 # Import the platform-specific implementations
 if os.name == 'posix':

docs/autogen_api.py

@@ -25,6 +25,7 b" if __name__ == '__main__':"
                                         r'\.cocoa',
                                         r'\.ipdoctest',
                                         r'\.Gnuplot',
+                                        r'\.frontend.process.winprocess',
                                         ]
     docwriter.write_api_docs(outdir)
     docwriter.write_index(outdir, 'gen',