Merge pull request #9946 from takluyver/py36-win-unicode

Don't require win_unicode_console on Python 3.6

IPython/terminal/interactiveshell.py

@@ -340,6 +340,11 @@ def prompt_for_code(self):
         return document.text
 
     def enable_win_unicode_console(self):
+        if sys.version_info >= (3, 6):
+            # Since PEP 528, Python uses the unicode APIs for the Windows
+            # console by default, so WUC shouldn't be needed.
+            return
+
         import win_unicode_console
 
         if PY3:

setup.py

@@ -218,7 +218,8 @@ def run(self):
     ':python_version == "2.7" or python_version == "3.3"': ['pathlib2'],
     ':sys_platform != "win32"': ['pexpect'],
     ':sys_platform == "darwin"': ['appnope'],
-    ':sys_platform == "win32"': ['colorama', 'win_unicode_console>=0.5'],
+    ':sys_platform == "win32"': ['colorama'],
+    ':sys_platform == "win32" and python_version < "3.6"': ['win_unicode_console>=0.5'],
     'test:python_version == "2.7"': ['mock'],
 })
 # FIXME: re-specify above platform dependencies for pip < 6