From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 5 Feb 2017 01:36:47 +0000 (-0800)
Subject: Adds precheck for console filename to fix Windows 7.
X-Git-Tag: v3.6.1rc1~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7e164881e9b853044ab1dcc3063a9aba8b83b19;p=python

Adds precheck for console filename to fix Windows 7.
---

diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index 1ad0bfcdcd..1d169e2764 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -86,6 +86,19 @@ char _PyIO_get_console_type(PyObject *path_or_fd) {
         return '\0';
     }
 
+    char m = '\0';
+    if (!_wcsicmp(decoded_wstr, L"CONIN$")) {
+        m = 'r';
+    } else if (!_wcsicmp(decoded_wstr, L"CONOUT$")) {
+        m = 'w';
+    } else if (!_wcsicmp(decoded_wstr, L"CON")) {
+        m = 'x';
+    }
+    if (m) {
+        PyMem_Free(decoded_wstr);
+        return m;
+    }
+
     DWORD length;
     wchar_t name_buf[MAX_PATH], *pname_buf = name_buf;
     
@@ -99,7 +112,6 @@ char _PyIO_get_console_type(PyObject *path_or_fd) {
     }
     PyMem_Free(decoded_wstr);
 
-    char m = '\0';
     if (length) {
         wchar_t *name = pname_buf;
         if (length >= 4 && name[3] == L'\\' &&