Merge branch PR 2445 into master

Merge "changes for ironpython" from paweljasinski:ironpython.

Merge manualy PR after changing the files mode back to 644.

IPython/core/displayhook.py

@@ -25,6 +25,9 b' from __future__ import print_function'
 
 import __builtin__
 
+import sys
+
+
 from IPython.config.configurable import Configurable
 from IPython.utils import io
 from IPython.utils.traitlets import Instance, List
@@ -266,5 +269,7 b' class DisplayHook(Configurable):'
             self.shell.user_ns.update({'_':None,'__':None, '___':None})
         import gc
         # TODO: Is this really needed?
+        # IronPython blocks here forever
+        if sys.platform != "cli":
         gc.collect()
 

IPython/utils/traitlets.py

@@ -927,11 +927,15 b' else:'
         def validate(self, obj, value):
             if isinstance(value, int):
                 return value
-            elif isinstance(value, long):
+            if isinstance(value, long):
                 # downcast longs that fit in int:
                 # note that int(n > sys.maxint) returns a long, so
                 # we don't need a condition on this cast
                 return int(value)
+            if sys.platform == "cli":
+                from System import Int64
+                if isinstance(value, Int64):
+                    return int(value)
             self.error(obj, value)