From f47baf40fb90d06fbe048af72248a3422a2c15c8 2009-05-16 13:07:22
From: Gael Varoquaux <gael.varoquaux@normalesup.org>
Date: 2009-05-16 13:07:22
Subject: [PATCH] Merge with trunk
---

diff --git a/IPython/Extensions/ipy_greedycompleter.py b/IPython/Extensions/ipy_greedycompleter.py
index 3b44751..37142d7 100644
--- a/IPython/Extensions/ipy_greedycompleter.py
+++ b/IPython/Extensions/ipy_greedycompleter.py
@@ -66,7 +66,7 @@ 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
diff --git a/IPython/iplib.py b/IPython/iplib.py
index c6515ef..0de50ec 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -2209,7 +2209,7 @@ 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
diff --git a/IPython/platutils.py b/IPython/platutils.py
index 561e68d..380652e 100644
--- a/IPython/platutils.py
+++ b/IPython/platutils.py
@@ -14,6 +14,7 @@ for your operation system, from platutils_PLATFORMNAME module.
 
 import os
 import sys
+import warnings
 
 # Import the platform-specific implementations
 if os.name == 'posix':
diff --git a/docs/autogen_api.py b/docs/autogen_api.py
index c7ab055..c7c54de 100755
--- a/docs/autogen_api.py
+++ b/docs/autogen_api.py
@@ -25,6 +25,7 @@ if __name__ == '__main__':
                                         r'\.cocoa',
                                         r'\.ipdoctest',
                                         r'\.Gnuplot',
+                                        r'\.frontend.process.winprocess',
                                         ]
     docwriter.write_api_docs(outdir)
     docwriter.write_index(outdir, 'gen',