Merging from upstream

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