[Python-checkins] r54681 - python/trunk/Lib/test/test_socket_ssl.py
facundo.batista
python-checkins at python.org
Wed Apr 4 16:10:40 CEST 2007
Author: facundo.batista
Date: Wed Apr 4 16:10:40 2007
New Revision: 54681
Modified:
python/trunk/Lib/test/test_socket_ssl.py
Log:
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
Modified: python/trunk/Lib/test/test_socket_ssl.py
==============================================================================
--- python/trunk/Lib/test/test_socket_ssl.py (original)
+++ python/trunk/Lib/test/test_socket_ssl.py Wed Apr 4 16:10:40 2007
@@ -8,7 +8,6 @@
import threading
import subprocess
import time
-import ctypes
import os
import urllib
@@ -128,18 +127,14 @@
threading.Thread.__init__(self)
def _external(self):
- if os.access("ssl_cert.pem", os.F_OK):
- cert_file = "ssl_cert.pem"
- elif os.access("./Lib/test/ssl_cert.pem", os.F_OK):
- cert_file = "./Lib/test/ssl_cert.pem"
- else:
- raise ValueError("No cert file found!")
- if os.access("ssl_key.pem", os.F_OK):
- key_file = "ssl_key.pem"
- 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!")
+ # let's find the .pem files
+ curdir = os.path.dirname(__file__) or os.curdir
+ cert_file = os.path.join(curdir, "ssl_cert.pem")
+ if not os.access(cert_file, os.F_OK):
+ raise ValueError("No cert file found! (tried %r)" % cert_file)
+ key_file = os.path.join(curdir, "ssl_key.pem")
+ if not os.access(key_file, os.F_OK):
+ raise ValueError("No key file found! (tried %r)" % key_file)
try:
cmd = "openssl s_server -cert %s -key %s -quiet" % (cert_file, key_file)
@@ -172,9 +167,7 @@
if not self.s:
return
if sys.platform == "win32":
- handle = ctypes.windll.kernel32.OpenProcess(1, False, self.s.pid)
- ctypes.windll.kernel32.TerminateProcess(handle, -1)
- ctypes.windll.kernel32.CloseHandle(handle)
+ subprocess.TerminateProcess(int(self.s._handle), -1)
else:
os.kill(self.s.pid, 15)
More information about the Python-checkins
mailing list