mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 23:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed the way that the .pem files are looked for, and changed

Browse source 
how to kill the process in win32 to use the _handle attribute.
This commit is contained in:
Facundo Batista 2007-04-04 14:10:40 +00:00
parent a0da5c7bce
commit 06c6579036
1 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/test_socket_ssl.py
View file

@ -8,7 +8,6 @@ import errno
import threading import threading
import subprocess import subprocess
import time import time
import ctypes
import os import os
import urllib import urllib
@ -128,18 +127,14 @@ class OpenSSLServer(threading.Thread):
threading.Thread.__init__(self) threading.Thread.__init__(self)
def _external(self): def _external(self):
if os.access("ssl_cert.pem", os.F_OK): # let's find the .pem files
cert_file = "ssl_cert.pem" curdir = os.path.dirname(__file__) or os.curdir
elif os.access("./Lib/test/ssl_cert.pem", os.F_OK): cert_file = os.path.join(curdir, "ssl_cert.pem")
cert_file = "./Lib/test/ssl_cert.pem" if not os.access(cert_file, os.F_OK):
else: raise ValueError("No cert file found! (tried %r)" % cert_file)
raise ValueError("No cert file found!") key_file = os.path.join(curdir, "ssl_key.pem")
if os.access("ssl_key.pem", os.F_OK): if not os.access(key_file, os.F_OK):
key_file = "ssl_key.pem" raise ValueError("No key file found! (tried %r)" % key_file)
elif os.access("./Lib/test/ssl_key.pem", os.F_OK):
key_file = "./Lib/test/ssl_key.pem"
else:
raise ValueError("No cert file found!")
try: try:
cmd = "openssl s_server -cert %s -key %s -quiet" % (cert_file, key_file) cmd = "openssl s_server -cert %s -key %s -quiet" % (cert_file, key_file)
@ -172,9 +167,7 @@ class OpenSSLServer(threading.Thread):
if not self.s: if not self.s:
return return
if sys.platform == "win32": if sys.platform == "win32":
handle = ctypes.windll.kernel32.OpenProcess(1, False, self.s.pid) subprocess.TerminateProcess(int(self.s._handle), -1)
ctypes.windll.kernel32.TerminateProcess(handle, -1)
ctypes.windll.kernel32.CloseHandle(handle)
else: else:
os.kill(self.s.pid, 15) os.kill(self.s.pid, 15)