From 422f6dd38def09572ec619a78a95ada94cb92129 2009-07-28 01:00:34
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2009-07-28 01:00:34
Subject: [PATCH] Merging from upstream
---

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':