mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-21 16:10:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

Browse source 
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
This commit is contained in:
Thomas Wouters 2006-04-21 10:40:58 +00:00
parent 9ada3d6e29
commit 49fd7fa443
640 changed files with 52240 additions and 18408 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Tools/buildbot/kill_python.c Normal file
View file

@ -0,0 +1,56 @@
/* This program looks for processes which have build\PCbuild\python.exe
in their path and terminates them. */
#include <windows.h>
#include <psapi.h>
#include <stdio.h>
int main()
{
DWORD pids[1024], cbNeeded;
int i, num_processes;
if (!EnumProcesses(pids, sizeof(pids), &cbNeeded)) {
printf("EnumProcesses failed\n");
return 1;
}
num_processes = cbNeeded/sizeof(pids[0]);
for (i = 0; i < num_processes; i++) {
HANDLE hProcess;
char path[MAX_PATH];
HMODULE mods[1024];
int k, num_mods;
hProcess = OpenProcess(PROCESS_QUERY_INFORMATION
| PROCESS_VM_READ
| PROCESS_TERMINATE ,
FALSE, pids[i]);
if (!hProcess)
/* process not accessible */
continue;
if (!EnumProcessModules(hProcess, mods, sizeof(mods), &cbNeeded)) {
/* For unknown reasons, this sometimes returns ERROR_PARTIAL_COPY;
this apparently means we are not supposed to read the process. */
if (GetLastError() == ERROR_PARTIAL_COPY) {
CloseHandle(hProcess);
continue;
}
printf("EnumProcessModules failed: %d\n", GetLastError());
return 1;
}
if (!GetModuleFileNameEx(hProcess, NULL, path, sizeof(path))) {
printf("GetProcessImageFileName failed\n");
return 1;
}
_strlwr(path);
/* printf("%s\n", path); */
if (strstr(path, "build\\pcbuild\\python_d.exe") != NULL) {
printf("Terminating %s (pid %d)\n", path, pids[i]);
if (!TerminateProcess(hProcess, 1)) {
printf("Termination failed: %d\n", GetLastError());
return 1;
}
return 0;
}
CloseHandle(hProcess);
}
}