Issue2564: Prevent a hang in "import test.autotest", which runs the entire test

suite as a side-effect of importing the module.

- in test_capi, a thread tried to import other modules
- re.compile() imported sre_parse again on every call.
This commit is contained in:
Amaury Forgeot d'Arc 2008-04-08 21:27:42 +00:00
parent abf8e015c2
commit 4b798bdf8a
2 changed files with 3 additions and 5 deletions

View File

@ -11,7 +11,7 @@
"""Internal support module for sre"""
import _sre, sys
import sre_parse
from sre_constants import *
assert _sre.MAGIC == MAGIC, "SRE module mismatch"
@ -502,7 +502,6 @@ def compile(p, flags=0):
# internal: convert pattern list to internal format
if isstring(p):
import sre_parse
pattern = p
p = sre_parse.parse(p, flags)
else:

View File

@ -19,9 +19,6 @@ def test_main():
# some extra thread-state tests driven via _testcapi
def TestThreadState():
import thread
import time
if test_support.verbose:
print "auto-thread-state"
@ -45,6 +42,8 @@ def test_main():
have_thread_state = False
if have_thread_state:
import thread
import time
TestThreadState()
import threading
t=threading.Thread(target=TestThreadState)