Changeset 391 for python/trunk/PC/os2vacpp

Timestamp:

Mar 19, 2014, 11:31:01 PM (12 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• PC/os2vacpp/getpathp.c (modified) (11 diffs)
• PC/os2vacpp/makefile (modified) (4 diffs)
• PC/os2vacpp/makefile.omk (modified) (4 diffs)
• PC/os2vacpp/python.def (modified) (5 diffs)

python/trunk/PC/os2vacpp/getpathp.c

@@ -56 +56 @@
 
 static int
-is_sep(char ch) /* determine if "ch" is a separator character */
+is_sep(char ch) /* determine if "ch" is a separator character */
 {
 #ifdef ALTSEP
-        return ch == SEP || ch == ALTSEP;
+    return ch == SEP || ch == ALTSEP;
 #else
-        return ch == SEP;
+    return ch == SEP;
 #endif
 }
@@ -69 +69 @@
 reduce(char *dir)
 {
-        int i = strlen(dir);
-        while (i > 0 && !is_sep(dir[i]))
-                --i;
-        dir[i] = '\0';
-}
-        
+    int i = strlen(dir);
+    while (i > 0 && !is_sep(dir[i]))
+        --i;
+    dir[i] = '\0';
+}
+
 
 static int
 exists(char *filename)
 {
-        struct stat buf;
-        return stat(filename, &buf) == 0;
+    struct stat buf;
+    return stat(filename, &buf) == 0;
 }
 
@@ -96 +96 @@
 join(char *buffer, char *stuff)
 {
-        int n, k;
-        if (is_sep(stuff[0]))
-                n = 0;
-        else {
-                n = strlen(buffer);
-                if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN)
-                        buffer[n++] = SEP;
-        }
-        if (n > MAXPATHLEN)
-                Py_FatalError("buffer overflow in getpathp.c's joinpath()");
-        k = strlen(stuff);
-        if (n + k > MAXPATHLEN)
-                k = MAXPATHLEN - n;
-        strncpy(buffer+n, stuff, k);
-        buffer[n+k] = '\0';
+    int n, k;
+    if (is_sep(stuff[0]))
+        n = 0;
+    else {
+        n = strlen(buffer);
+        if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN)
+            buffer[n++] = SEP;
+    }
+    if (n > MAXPATHLEN)
+        Py_FatalError("buffer overflow in getpathp.c's joinpath()");
+    k = strlen(stuff);
+    if (n + k > MAXPATHLEN)
+        k = MAXPATHLEN - n;
+    strncpy(buffer+n, stuff, k);
+    buffer[n+k] = '\0';
 }
 
@@ -117 +117 @@
 search_for_prefix(char *argv0_path, char *landmark)
 {
-        int n;
-
-        /* Search from argv0_path, until root is found */
-        strcpy(prefix, argv0_path);
-        do {
-                n = strlen(prefix);
-                join(prefix, landmark);
-                if (exists(prefix)) {
-                        prefix[n] = '\0';
-                        return 1;
-                }
-                prefix[n] = '\0';
-                reduce(prefix);
-        } while (prefix[0]);
-        return 0;
+    int n;
+
+    /* Search from argv0_path, until root is found */
+    strcpy(prefix, argv0_path);
+    do {
+        n = strlen(prefix);
+        join(prefix, landmark);
+        if (exists(prefix)) {
+            prefix[n] = '\0';
+            return 1;
+        }
+        prefix[n] = '\0';
+        reduce(prefix);
+    } while (prefix[0]);
+    return 0;
 }
 
@@ -148 +148 @@
 getpythonregpath(HKEY keyBase, BOOL bWin32s)
 {
-        HKEY newKey = 0;
-        DWORD nameSize = 0;
-        DWORD dataSize = 0;
-        DWORD numEntries = 0;
-        LONG rc;
-        char *retval = NULL;
-        char *dataBuf;
-        const char keyPrefix[] = "Software\\Python\\PythonCore\\";
-        const char keySuffix[] = "\\PythonPath";
-        int versionLen;
-        char *keyBuf;
-
-        // Tried to use sysget("winver") but here is too early :-(
-        versionLen = strlen(PyWin_DLLVersionString);
-        // alloca == no free required, but memory only local to fn.
-        // also no heap fragmentation!  Am I being silly?
-        keyBuf = alloca(sizeof(keyPrefix)-1 + versionLen + sizeof(keySuffix)); // chars only, plus 1 NULL.
-        // lots of constants here for the compiler to optimize away :-)
-        memcpy(keyBuf, keyPrefix, sizeof(keyPrefix)-1);
-        memcpy(keyBuf+sizeof(keyPrefix)-1, PyWin_DLLVersionString, versionLen);
-        memcpy(keyBuf+sizeof(keyPrefix)-1+versionLen, keySuffix, sizeof(keySuffix)); // NULL comes with this one!
-
-        rc=RegOpenKey(keyBase,
-                      keyBuf,
-                      &newKey);
-        if (rc==ERROR_SUCCESS) {
-                RegQueryInfoKey(newKey, NULL, NULL, NULL, NULL, NULL, NULL, 
-                                &numEntries, &nameSize, &dataSize, NULL, NULL);
-        }
-        if (bWin32s && numEntries==0 && dataSize==0) {
-                /* must hardcode for Win32s */
-                numEntries = 1;
-                dataSize = 511;
-        }
-        if (numEntries) {
-                /* Loop over all subkeys. */
-                /* Win32s doesnt know how many subkeys, so we do
-                   it twice */
-                char keyBuf[MAX_PATH+1];
-                int index = 0;
-                int off = 0;
-                for(index=0;;index++) {
-                        long reqdSize = 0;
-                        DWORD rc = RegEnumKey(newKey,
-                                              index, keyBuf, MAX_PATH+1);
-                        if (rc) break;
-                        rc = RegQueryValue(newKey, keyBuf, NULL, &reqdSize);
-                        if (rc) break;
-                        if (bWin32s && reqdSize==0) reqdSize = 512;
-                        dataSize += reqdSize + 1; /* 1 for the ";" */
-                }
-                dataBuf = malloc(dataSize+1);
-                if (dataBuf==NULL)
-                        return NULL; /* pretty serious?  Raise error? */
-                /* Now loop over, grabbing the paths.
-                   Subkeys before main library */
-                for(index=0;;index++) {
-                        int adjust;
-                        long reqdSize = dataSize;
-                        DWORD rc = RegEnumKey(newKey,
-                                              index, keyBuf,MAX_PATH+1);
-                        if (rc) break;
-                        rc = RegQueryValue(newKey,
-                                           keyBuf, dataBuf+off, &reqdSize);
-                        if (rc) break;
-                        if (reqdSize>1) {
-                                /* If Nothing, or only '\0' copied. */
-                                adjust = strlen(dataBuf+off);
-                                dataSize -= adjust;
-                                off += adjust;
-                                dataBuf[off++] = ';';
-                                dataBuf[off] = '\0';
-                                dataSize--;
-                        }
-                }
-                /* Additionally, win32s doesnt work as expected, so
-                   the specific strlen() is required for 3.1. */
-                rc = RegQueryValue(newKey, "", dataBuf+off, &dataSize);
-                if (rc==ERROR_SUCCESS) {
-                        if (strlen(dataBuf)==0)
-                                free(dataBuf);
-                        else
-                                retval = dataBuf; /* caller will free */
-                }
-                else
-                        free(dataBuf);
-        }
-
-        if (newKey)
-                RegCloseKey(newKey);
-        return retval;
+    HKEY newKey = 0;
+    DWORD nameSize = 0;
+    DWORD dataSize = 0;
+    DWORD numEntries = 0;
+    LONG rc;
+    char *retval = NULL;
+    char *dataBuf;
+    const char keyPrefix[] = "Software\\Python\\PythonCore\\";
+    const char keySuffix[] = "\\PythonPath";
+    int versionLen;
+    char *keyBuf;
+
+    // Tried to use sysget("winver") but here is too early :-(
+    versionLen = strlen(PyWin_DLLVersionString);
+    // alloca == no free required, but memory only local to fn.
+    // also no heap fragmentation!  Am I being silly?
+    keyBuf = alloca(sizeof(keyPrefix)-1 + versionLen + sizeof(keySuffix)); // chars only, plus 1 NULL.
+    // lots of constants here for the compiler to optimize away :-)
+    memcpy(keyBuf, keyPrefix, sizeof(keyPrefix)-1);
+    memcpy(keyBuf+sizeof(keyPrefix)-1, PyWin_DLLVersionString, versionLen);
+    memcpy(keyBuf+sizeof(keyPrefix)-1+versionLen, keySuffix, sizeof(keySuffix)); // NULL comes with this one!
+
+    rc=RegOpenKey(keyBase,
+                  keyBuf,
+                  &newKey);
+    if (rc==ERROR_SUCCESS) {
+        RegQueryInfoKey(newKey, NULL, NULL, NULL, NULL, NULL, NULL,
+                        &numEntries, &nameSize, &dataSize, NULL, NULL);
+    }
+    if (bWin32s && numEntries==0 && dataSize==0) {
+        /* must hardcode for Win32s */
+        numEntries = 1;
+        dataSize = 511;
+    }
+    if (numEntries) {
+        /* Loop over all subkeys. */
+        /* Win32s doesnt know how many subkeys, so we do
+           it twice */
+        char keyBuf[MAX_PATH+1];
+        int index = 0;
+        int off = 0;
+        for(index=0;;index++) {
+            long reqdSize = 0;
+            DWORD rc = RegEnumKey(newKey,
+                                  index, keyBuf, MAX_PATH+1);
+            if (rc) break;
+            rc = RegQueryValue(newKey, keyBuf, NULL, &reqdSize);
+            if (rc) break;
+            if (bWin32s && reqdSize==0) reqdSize = 512;
+            dataSize += reqdSize + 1; /* 1 for the ";" */
+        }
+        dataBuf = malloc(dataSize+1);
+        if (dataBuf==NULL)
+            return NULL; /* pretty serious?  Raise error? */
+        /* Now loop over, grabbing the paths.
+           Subkeys before main library */
+        for(index=0;;index++) {
+            int adjust;
+            long reqdSize = dataSize;
+            DWORD rc = RegEnumKey(newKey,
+                                  index, keyBuf,MAX_PATH+1);
+            if (rc) break;
+            rc = RegQueryValue(newKey,
+                               keyBuf, dataBuf+off, &reqdSize);
+            if (rc) break;
+            if (reqdSize>1) {
+                /* If Nothing, or only '\0' copied. */
+                adjust = strlen(dataBuf+off);
+                dataSize -= adjust;
+                off += adjust;
+                dataBuf[off++] = ';';
+                dataBuf[off] = '\0';
+                dataSize--;
+            }
+        }
+        /* Additionally, win32s doesnt work as expected, so
+           the specific strlen() is required for 3.1. */
+        rc = RegQueryValue(newKey, "", dataBuf+off, &dataSize);
+        if (rc==ERROR_SUCCESS) {
+            if (strlen(dataBuf)==0)
+                free(dataBuf);
+            else
+                retval = dataBuf; /* caller will free */
+        }
+        else
+            free(dataBuf);
+    }
+
+    if (newKey)
+        RegCloseKey(newKey);
+    return retval;
 }
 #endif /* MS_WIN32 */
@@ -245 +245 @@
 get_progpath(void)
 {
-        extern char *Py_GetProgramName(void);
-        char *path = getenv("PATH");
-        char *prog = Py_GetProgramName();
-
-#ifdef MS_WIN32
-        if (GetModuleFileName(NULL, progpath, MAXPATHLEN))
-                return;
-#endif
-        if (prog == NULL || *prog == '\0')
-                prog = "python";
-
-        /* If there is no slash in the argv0 path, then we have to
-         * assume python is on the user's $PATH, since there's no
-         * other way to find a directory to start the search from.  If
-         * $PATH isn't exported, you lose.
-         */
+    extern char *Py_GetProgramName(void);
+    char *path = getenv("PATH");
+    char *prog = Py_GetProgramName();
+
+#ifdef MS_WIN32
+    if (GetModuleFileName(NULL, progpath, MAXPATHLEN))
+        return;
+#endif
+    if (prog == NULL || *prog == '\0')
+        prog = "python";
+
+    /* If there is no slash in the argv0 path, then we have to
+     * assume python is on the user's $PATH, since there's no
+     * other way to find a directory to start the search from.  If
+     * $PATH isn't exported, you lose.
+     */
 #ifdef ALTSEP
-        if (strchr(prog, SEP) || strchr(prog, ALTSEP))
+    if (strchr(prog, SEP) || strchr(prog, ALTSEP))
 #else
-        if (strchr(prog, SEP))
-#endif
-                strcpy(progpath, prog);
-        else if (path) {
-                while (1) {
-                        char *delim = strchr(path, DELIM);
-
-                        if (delim) {
-                                int len = delim - path;
-                                strncpy(progpath, path, len);
-                                *(progpath + len) = '\0';
-                        }
-                        else
-                                strcpy(progpath, path);
-
-                        join(progpath, prog);
-                        if (exists(progpath))
-                                break;
-
-                        if (!delim) {
-                                progpath[0] = '\0';
-                                break;
-                        }
-                        path = delim + 1;
-                }
-        }
-        else
-                progpath[0] = '\0';
+    if (strchr(prog, SEP))
+#endif
+        strcpy(progpath, prog);
+    else if (path) {
+        while (1) {
+            char *delim = strchr(path, DELIM);
+
+            if (delim) {
+                int len = delim - path;
+                strncpy(progpath, path, len);
+                *(progpath + len) = '\0';
+            }
+            else
+                strcpy(progpath, path);
+
+            join(progpath, prog);
+            if (exists(progpath))
+                break;
+
+            if (!delim) {
+                progpath[0] = '\0';
+                break;
+            }
+            path = delim + 1;
+        }
+    }
+    else
+        progpath[0] = '\0';
 }
 
@@ -297 +297 @@
 calculate_path(void)
 {
-        char argv0_path[MAXPATHLEN+1];
-        char *buf;
-        int bufsz;
-        char *pythonhome = Py_GetPythonHome();
-        char *envpath = Py_GETENV("PYTHONPATH");
-#ifdef MS_WIN32
-        char *machinepath, *userpath;
-
-        /* Are we running under Windows 3.1(1) Win32s? */
-        if (PyWin_IsWin32s()) {
-                /* Only CLASSES_ROOT is supported */
-                machinepath = getpythonregpath(HKEY_CLASSES_ROOT, TRUE); 
-                userpath = NULL;
-        } else {
-                machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, FALSE);
-                userpath = getpythonregpath(HKEY_CURRENT_USER, FALSE);
-        }
-#endif
-
-        get_progpath();
-        strcpy(argv0_path, progpath);
-        reduce(argv0_path);
-        if (pythonhome == NULL || *pythonhome == '\0') {
-                if (search_for_prefix(argv0_path, LANDMARK))
-                        pythonhome = prefix;
-                else
-                        pythonhome = NULL;
-        }
-        else {
-        char *delim;
-
-                strcpy(prefix, pythonhome);
-
-        /* Extract Any Optional Trailing EXEC_PREFIX */
-        /* e.g. PYTHONHOME=<prefix>:<exec_prefix>   */
-        delim = strchr(prefix, DELIM);
-        if (delim) {
-            *delim = '\0';
-            strcpy(exec_prefix, delim+1);
-        } else
-            strcpy(exec_prefix, EXEC_PREFIX);
-    }
-
-        if (envpath && *envpath == '\0')
-                envpath = NULL;
-
-        /* We need to construct a path from the following parts:
-           (1) the PYTHONPATH environment variable, if set;
-           (2) for Win32, the machinepath and userpath, if set;
-           (3) the PYTHONPATH config macro, with the leading "."
-               of each component replaced with pythonhome, if set;
-           (4) the directory containing the executable (argv0_path).
-           The length calculation calculates #3 first.
-        */
-
-        /* Calculate size of return buffer */
-        if (pythonhome != NULL) {
-                char *p;
-                bufsz = 1;      
-                for (p = PYTHONPATH; *p; p++) {
-                        if (*p == DELIM)
-                                bufsz++; /* number of DELIM plus one */
-                }
-                bufsz *= strlen(pythonhome);
-        }
-        else
-                bufsz = 0;
-        bufsz += strlen(PYTHONPATH) + 1;
-        if (envpath != NULL)
-                bufsz += strlen(envpath) + 1;
-        bufsz += strlen(argv0_path) + 1;
-#ifdef MS_WIN32
-        if (machinepath)
-                bufsz += strlen(machinepath) + 1;
-        if (userpath)
-                bufsz += strlen(userpath) + 1;
-#endif
-
-        module_search_path = buf = malloc(bufsz);
-        if (buf == NULL) {
-                /* We can't exit, so print a warning and limp along */
-                fprintf(stderr, "Can't malloc dynamic PYTHONPATH.\n");
-                if (envpath) {
-                        fprintf(stderr, "Using default static $PYTHONPATH.\n");
-                        module_search_path = envpath;
-                }
-                else {
-                        fprintf(stderr, "Using environment $PYTHONPATH.\n");
-                        module_search_path = PYTHONPATH;
-                }
-                return;
-        }
-
-        if (envpath) {
-                strcpy(buf, envpath);
-                buf = strchr(buf, '\0');
-                *buf++ = DELIM;
-        }
-#ifdef MS_WIN32
-        if (machinepath) {
-                strcpy(buf, machinepath);
-                buf = strchr(buf, '\0');
-                *buf++ = DELIM;
-        }
-        if (userpath) {
-                strcpy(buf, userpath);
-                buf = strchr(buf, '\0');
-                *buf++ = DELIM;
-        }
-#endif
-        if (pythonhome == NULL) {
-                strcpy(buf, PYTHONPATH);
-                buf = strchr(buf, '\0');
-        }
-        else {
-                char *p = PYTHONPATH;
-                char *q;
-                int n;
-                for (;;) {
-                        q = strchr(p, DELIM);
-                        if (q == NULL)
-                                n = strlen(p);
-                        else
-                                n = q-p;
-                        if (p[0] == '.' && is_sep(p[1])) {
-                                strcpy(buf, pythonhome);
-                                buf = strchr(buf, '\0');
-                                p++;
-                                n--;
-                        }
-                        strncpy(buf, p, n);
-                        buf += n;
-                        if (q == NULL)
-                                break;
-                        *buf++ = DELIM;
-                        p = q+1;
-                }
-        }
-        if (argv0_path) {
-                *buf++ = DELIM;
-                strcpy(buf, argv0_path);
-                buf = strchr(buf, '\0');
-        }
-        *buf = '\0';
+    char argv0_path[MAXPATHLEN+1];
+    char *buf;
+    int bufsz;
+    char *pythonhome = Py_GetPythonHome();
+    char *envpath = Py_GETENV("PYTHONPATH");
+#ifdef MS_WIN32
+    char *machinepath, *userpath;
+
+    /* Are we running under Windows 3.1(1) Win32s? */
+    if (PyWin_IsWin32s()) {
+        /* Only CLASSES_ROOT is supported */
+        machinepath = getpythonregpath(HKEY_CLASSES_ROOT, TRUE);
+        userpath = NULL;
+    } else {
+        machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, FALSE);
+        userpath = getpythonregpath(HKEY_CURRENT_USER, FALSE);
+    }
+#endif
+
+    get_progpath();
+    strcpy(argv0_path, progpath);
+    reduce(argv0_path);
+    if (pythonhome == NULL || *pythonhome == '\0') {
+        if (search_for_prefix(argv0_path, LANDMARK))
+            pythonhome = prefix;
+        else
+            pythonhome = NULL;
+    }
+    else {
+    char *delim;
+
+        strcpy(prefix, pythonhome);
+
+    /* Extract Any Optional Trailing EXEC_PREFIX */
+    /* e.g. PYTHONHOME=<prefix>:<exec_prefix>   */
+    delim = strchr(prefix, DELIM);
+    if (delim) {
+        *delim = '\0';
+        strcpy(exec_prefix, delim+1);
+    } else
+        strcpy(exec_prefix, EXEC_PREFIX);
+    }
+
+    if (envpath && *envpath == '\0')
+        envpath = NULL;
+
+    /* We need to construct a path from the following parts:
+       (1) the PYTHONPATH environment variable, if set;
+       (2) for Win32, the machinepath and userpath, if set;
+       (3) the PYTHONPATH config macro, with the leading "."
+           of each component replaced with pythonhome, if set;
+       (4) the directory containing the executable (argv0_path).
+       The length calculation calculates #3 first.
+    */
+
+    /* Calculate size of return buffer */
+    if (pythonhome != NULL) {
+        char *p;
+        bufsz = 1;
+        for (p = PYTHONPATH; *p; p++) {
+            if (*p == DELIM)
+                bufsz++; /* number of DELIM plus one */
+        }
+        bufsz *= strlen(pythonhome);
+    }
+    else
+        bufsz = 0;
+    bufsz += strlen(PYTHONPATH) + 1;
+    if (envpath != NULL)
+        bufsz += strlen(envpath) + 1;
+    bufsz += strlen(argv0_path) + 1;
+#ifdef MS_WIN32
+    if (machinepath)
+        bufsz += strlen(machinepath) + 1;
+    if (userpath)
+        bufsz += strlen(userpath) + 1;
+#endif
+
+    module_search_path = buf = malloc(bufsz);
+    if (buf == NULL) {
+        /* We can't exit, so print a warning and limp along */
+        fprintf(stderr, "Can't malloc dynamic PYTHONPATH.\n");
+        if (envpath) {
+            fprintf(stderr, "Using default static $PYTHONPATH.\n");
+            module_search_path = envpath;
+        }
+        else {
+            fprintf(stderr, "Using environment $PYTHONPATH.\n");
+            module_search_path = PYTHONPATH;
+        }
+        return;
+    }
+
+    if (envpath) {
+        strcpy(buf, envpath);
+        buf = strchr(buf, '\0');
+        *buf++ = DELIM;
+    }
+#ifdef MS_WIN32
+    if (machinepath) {
+        strcpy(buf, machinepath);
+        buf = strchr(buf, '\0');
+        *buf++ = DELIM;
+    }
+    if (userpath) {
+        strcpy(buf, userpath);
+        buf = strchr(buf, '\0');
+        *buf++ = DELIM;
+    }
+#endif
+    if (pythonhome == NULL) {
+        strcpy(buf, PYTHONPATH);
+        buf = strchr(buf, '\0');
+    }
+    else {
+        char *p = PYTHONPATH;
+        char *q;
+        int n;
+        for (;;) {
+            q = strchr(p, DELIM);
+            if (q == NULL)
+                n = strlen(p);
+            else
+                n = q-p;
+            if (p[0] == '.' && is_sep(p[1])) {
+                strcpy(buf, pythonhome);
+                buf = strchr(buf, '\0');
+                p++;
+                n--;
+            }
+            strncpy(buf, p, n);
+            buf += n;
+            if (q == NULL)
+                break;
+            *buf++ = DELIM;
+            p = q+1;
+        }
+    }
+    if (argv0_path) {
+        *buf++ = DELIM;
+        strcpy(buf, argv0_path);
+        buf = strchr(buf, '\0');
+    }
+    *buf = '\0';
 }
 
@@ -449 +449 @@
 Py_GetPath(void)
 {
-        if (!module_search_path)
-                calculate_path();
-
-        return module_search_path;
+    if (!module_search_path)
+        calculate_path();
+
+    return module_search_path;
 }
 
@@ -458 +458 @@
 Py_GetPrefix(void)
 {
-        if (!module_search_path)
-                calculate_path();
-
-        return prefix;
+    if (!module_search_path)
+        calculate_path();
+
+    return prefix;
 }
 
@@ -467 +467 @@
 Py_GetExecPrefix(void)
 {
-        if (!module_search_path)
-                calculate_path();
-
-        return exec_prefix;
+    if (!module_search_path)
+        calculate_path();
+
+    return exec_prefix;
 }
 
@@ -476 +476 @@
 Py_GetProgramFullPath(void)
 {
-        if (!module_search_path)
-                calculate_path();
-
-        return progpath;
-}
+    if (!module_search_path)
+        calculate_path();
+
+    return progpath;
+}

python/trunk/PC/os2vacpp/makefile

@@ -204 +204 @@
                   $(PATHOBJ)\StructModule.obj  \
                   $(PATHOBJ)\TimeModule.obj    \
-                  $(PATHOBJ)\ThreadModule.obj  \
-                  $(PATHOBJ)\YUVConvert.obj
+                  $(PATHOBJ)\ThreadModule.obj
 
 # Standalone Parser Generator Program (Shares Some of Python's Modules)
@@ -1114 +1113 @@
          $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \
          $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
-         $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h \
-         $(PY_MODULES)\yuv.h
+         $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
 syslogmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
@@ -1198 +1196 @@
          $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
          $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
-
-yuvconvert.obj: $(PY_MODULES)\yuv.h
 
 zlibmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \
@@ -1697 +1693 @@
          $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
          $(PY_INCLUDE)\tupleobject.h
-
-getmtime.obj: pyconfig.h
 
 getplatform.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \

python/trunk/PC/os2vacpp/makefile.omk

@@ -165 +165 @@
                   StructModule.obj  \
                   TimeModule.obj    \
-                  ThreadModule.obj  \
-                  YUVConvert.obj
+                  ThreadModule.obj
 
 # Omitted Modules (and Description/Reason):
@@ -804 +803 @@
          moduleobject.h mymalloc.h myproto.h object.h objimpl.h pydebug.h \
          pyerrors.h pyfpe.h pystate.h python.h pythonrun.h rangeobject.h \
-         sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h \
-         yuv.h
+         sliceobject.h stringobject.h sysmodule.h traceback.h tupleobject.h
 
 syslogmodule.obj: abstract.h ceval.h classobject.h cobject.h \
@@ -854 +852 @@
          pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
          traceback.h tupleobject.h
-
-yuvconvert.obj: yuv.h
 
 zlibmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
@@ -1160 +1156 @@
          stringobject.h sysmodule.h traceback.h tupleobject.h
 
-getmtime.obj: pyconfig.h
-
 getplatform.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
          pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \

python/trunk/PC/os2vacpp/python.def

@@ -7 +7 @@
                ; Data
                PyCFunction_Type
+               PyCapsule_Type
                PyCObject_Type
                PyClass_Type
@@ -76 +77 @@
                _Py_ZeroStruct
                _Py_abstract_hack
+               _Py_capsule_hack
                _Py_cobject_hack
                _Py_re_syntax
@@ -90 +92 @@
                PyCFunction_GetSelf
                PyCFunction_New
+               PyCapsule_GetContext
+               PyCapsule_GetDestructor
+               PyCapsule_GetName
+               PyCapsule_GetPointer
+               PyCapsule_Import
+               PyCapsule_IsValid
+               PyCapsule_New
+               PyCapsule_SetContext
+               PyCapsule_SetDestructor
+               PyCapsule_SetName
+               PyCapsule_SetPointer
                PyCObject_AsVoidPtr
                PyCObject_FromVoidPtrAndDesc
@@ -285 +298 @@
                PyOS_AfterFork
                PyOS_FiniInterrupts
-               PyOS_GetLastModificationTime
                PyOS_InitInterrupts
                PyOS_InterruptOccurred
@@ -370 +382 @@
                PyThreadState_New
                PyThreadState_Swap
-               PyThread__exit_thread
                PyThread_acquire_lock
                PyThread_allocate_lock