Remove dead Windows code which no longer will compile.

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 36af21354a8557c50ffd1cec42b3d62a18a5cb41..05c4184658ba89feeb3c4b8c35ec70670996487f 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -615,33 +615,6 @@
                <File\r
                        RelativePath="..\..\Python\import.c">\r
                </File>\r
-               <File\r
-                       RelativePath="..\..\PC\import_nt.c">\r
-                       <FileConfiguration\r
-                               Name="Release|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       AdditionalIncludeDirectories="..\..\Python"/>\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       AdditionalIncludeDirectories="..\..\Python"/>\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="ReleaseItanium|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       AdditionalIncludeDirectories="..\..\Python"/>\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="ReleaseAMD64|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       AdditionalIncludeDirectories="..\..\Python"/>\r
-                       </FileConfiguration>\r
-               </File>\r
                <File\r
                        RelativePath="..\..\Python\importdl.c">\r
                </File>\r

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index e81559e1fd5ca396da4d95a9f3183097f683c986..a75bb9debb828b92823442d471599be133c229cb 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1706,10 +1706,6 @@
                                RelativePath="..\..\PC\getpathp.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\PC\import_nt.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\PC\msvcrtmodule.c"\r
                                >\r

diff --git a/PC/import_nt.c b/PC/import_nt.c
deleted file mode 100644 (file)
index b9b36dc..0000000
--- a/PC/import_nt.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/********************************************************************
-
- import_nt.c
-
-  Win32 specific import code.
-
-*/
-
-#include "Python.h"
-#include "osdefs.h"
-#include <windows.h>
-#include "importdl.h"
-#include "malloc.h" /* for alloca */
-
-/* a string loaded from the DLL at startup */
-extern const char *PyWin_DLLVersionString;
-
-/* Find a module on Windows.
-
-   Read the registry Software\Python\PythonCore\<version>\Modules\<name> (or
-   Software\Python\PythonCore\<version>\Modules\<name>\Debug in debug mode)
-   from HKEY_CURRENT_USER, or HKEY_LOCAL_MACHINE. Find the file descriptor using
-   the file extension. Open the file.
-
-   On success, write the file descriptor into *ppFileDesc, the module path
-   (Unicode object) into *pPath, and return the opened file object. If the
-   module cannot be found (e.g. no registry key or the file doesn't exist),
-   return NULL. On error, raise a Python exception and return NULL.
- */
-FILE *
-_PyWin_FindRegisteredModule(PyObject *moduleName,
-                            struct filedescr **ppFileDesc,
-                            PyObject **pPath)
-{
-    wchar_t pathBuf[MAXPATHLEN+1];
-    int pathLen = MAXPATHLEN+1;
-    PyObject *path, *moduleKey, *suffix;
-    wchar_t *wmoduleKey, *wsuffix;
-    struct filedescr *fdp;
-    HKEY keyBase;
-    int modNameSize;
-    long regStat;
-    Py_ssize_t extLen;
-    FILE *fp;
-
-    moduleKey = PyUnicode_FromFormat(
-#ifdef _DEBUG
-        /* In debugging builds, we _must_ have the debug version registered */
-        "Software\\Python\\PythonCore\\%s\\Modules\\%U\\Debug",
-#else
-        "Software\\Python\\PythonCore\\%s\\Modules\\%U",
-#endif
-        PyWin_DLLVersionString, moduleName);
-    if (moduleKey == NULL)
-        return NULL;
-    wmoduleKey = PyUnicode_AsUnicode(moduleKey);
-    if (wmoduleKey == NULL) {
-        Py_DECREF(moduleKey);
-        return NULL;
-    }
-
-    keyBase = HKEY_CURRENT_USER;
-    modNameSize = pathLen;
-    regStat = RegQueryValueW(keyBase, wmoduleKey,
-                             pathBuf, &modNameSize);
-    if (regStat != ERROR_SUCCESS) {
-        /* No user setting - lookup in machine settings */
-        keyBase = HKEY_LOCAL_MACHINE;
-        /* be anal - failure may have reset size param */
-        modNameSize = pathLen;
-        regStat = RegQueryValueW(keyBase, wmoduleKey,
-                                 pathBuf, &modNameSize);
-        if (regStat != ERROR_SUCCESS) {
-            Py_DECREF(moduleKey);
-            return NULL;
-        }
-    }
-    Py_DECREF(moduleKey);
-    if (modNameSize < 3) {
-        /* path shorter than "a.o" or negative length (cast to
-           size_t is wrong) */
-        return NULL;
-    }
-    /* use the file extension to locate the type entry. */
-    for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
-        suffix = PyUnicode_FromString(fdp->suffix);
-        if (suffix == NULL)
-            return NULL;
-        wsuffix = PyUnicode_AsUnicodeAndSize(suffix, &extLen);
-        if (wsuffix == NULL) {
-            Py_DECREF(suffix);
-            return NULL;
-        }
-        if ((Py_ssize_t)modNameSize > extLen &&
-            _wcsnicmp(pathBuf + ((Py_ssize_t)modNameSize-extLen-1),
-                      wsuffix,
-                      extLen) == 0)
-        {
-            Py_DECREF(suffix);
-            break;
-        }
-        Py_DECREF(suffix);
-    }
-    if (fdp->suffix == NULL)
-        return NULL;
-    path = PyUnicode_FromWideChar(pathBuf, wcslen(pathBuf));
-    if (path == NULL)
-        return NULL;
-    fp = _Py_fopen(path, fdp->mode);
-    if (fp == NULL) {
-        Py_DECREF(path);
-        return NULL;
-    }
-    *pPath = path;
-    *ppFileDesc = fdp;
-    return fp;
-}

diff --git a/Python/import.c b/Python/import.c
index 8349b776c60be1e51cdd3dd3b04cccd964923408..4edc3a75f83ead7c6a4f394070663d1bc1f63475 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1150,12 +1150,6 @@ PyImport_GetImporter(PyObject *path) {
 }
 
 
-#ifdef MS_COREDLL
-extern FILE *_PyWin_FindRegisteredModule(PyObject *, struct filedescr **,
-                                         PyObject **p_path);
-#endif
-
-
 static int init_builtin(PyObject *); /* Forward */
 
 /* Initialize a built-in module.