mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Import and raise statement cleanup.

Browse source
This commit is contained in:
Collin Winter 2007-04-25 18:54:36 +00:00
parent 355954e97a
commit f00c5b5873
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/test/test_support.py
View file

@ -1,14 +1,17 @@
"""Supporting definitions for the Python regression tests.""" """Supporting definitions for the Python regression tests."""
if __name__ != 'test.test_support': if __name__ != 'test.test_support':
raise ImportError, 'test_support must be imported from the test package' raise ImportError('test_support must be imported from the test package')
import contextlib import contextlib
import errno import errno
import socket import socket
import sys import sys
import os
import os.path
import warnings import warnings
import types import types
import unittest
class Error(Exception): class Error(Exception):
"""Base class for regression test exceptions.""" """Base class for regression test exceptions."""
@ -57,7 +60,6 @@ def unload(name):
pass pass
def unlink(filename): def unlink(filename):
import os
try: try:
os.unlink(filename) os.unlink(filename)
except OSError: except OSError:
@ -67,7 +69,6 @@ def forget(modname):
'''"Forget" a module was ever imported by removing it from sys.modules and '''"Forget" a module was ever imported by removing it from sys.modules and
deleting any .pyc and .pyo files.''' deleting any .pyc and .pyo files.'''
unload(modname) unload(modname)
import os
for dirname in sys.path: for dirname in sys.path:
unlink(os.path.join(dirname, modname + os.extsep + 'pyc')) unlink(os.path.join(dirname, modname + os.extsep + 'pyc'))
# Deleting the .pyo file cannot be within the 'try' for the .pyc since # Deleting the .pyo file cannot be within the 'try' for the .pyc since
@ -99,7 +100,6 @@ def bind_port(sock, host='', preferred_port=54321):
tests and we don't try multiple ports, the test can fails. This tests and we don't try multiple ports, the test can fails. This
makes the test more robust.""" makes the test more robust."""
import socket, errno
# some random ports that hopefully no one is listening on. # some random ports that hopefully no one is listening on.
for port in [preferred_port, 9907, 10243, 32999]: for port in [preferred_port, 9907, 10243, 32999]:
try: try:
@ -110,7 +110,7 @@ def bind_port(sock, host='', preferred_port=54321):
raise raise
print >>sys.__stderr__, \ print >>sys.__stderr__, \
' WARNING: failed to listen on port %d, trying another' % port ' WARNING: failed to listen on port %d, trying another' % port
raise TestFailed, 'unable to find port to listen on' raise TestFailed('unable to find port to listen on')
FUZZ = 1e-6 FUZZ = 1e-6
@ -139,7 +139,6 @@ except NameError:
is_jython = sys.platform.startswith('java') is_jython = sys.platform.startswith('java')
import os
# Filename used for testing # Filename used for testing
if os.name == 'java': if os.name == 'java':
# Jython disallows @ in module names # Jython disallows @ in module names
@ -202,13 +201,12 @@ except IOError:
if fp is not None: if fp is not None:
fp.close() fp.close()
unlink(TESTFN) unlink(TESTFN)
del os, fp del fp
def findfile(file, here=__file__): def findfile(file, here=__file__):
"""Try to find a file on sys.path and the working directory. If it is not """Try to find a file on sys.path and the working directory. If it is not
found the argument passed to the function is returned (this does not found the argument passed to the function is returned (this does not
necessarily signal failure; could still be the legitimate path).""" necessarily signal failure; could still be the legitimate path)."""
import os
if os.path.isabs(file): if os.path.isabs(file):
return file return file
path = sys.path path = sys.path
@ -240,7 +238,7 @@ def vereq(a, b):
""" """
if not (a == b): if not (a == b):
raise TestFailed, "%r == %r" % (a, b) raise TestFailed("%r == %r" % (a, b))
def sortdict(dict): def sortdict(dict):
"Like repr(dict), but in sorted order." "Like repr(dict), but in sorted order."
@ -260,7 +258,6 @@ def check_syntax_error(testcase, statement):
def open_urlresource(url): def open_urlresource(url):
import urllib, urlparse import urllib, urlparse
import os.path
filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL! filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
@ -325,8 +322,7 @@ class EnvironmentVarGuard(object):
a context manager.""" a context manager."""
def __init__(self): def __init__(self):
from os import environ self._environ = os.environ
self._environ = environ
self._unset = set() self._unset = set()
self._reset = dict() self._reset = dict()
@ -508,10 +504,7 @@ def bigaddrspacetest(f):
return wrapper return wrapper
#======================================================================= #=======================================================================
# Preliminary PyUNIT integration. # unittest integration.
import unittest
class BasicTestRunner: class BasicTestRunner:
def run(self, test): def run(self, test):
@ -619,7 +612,6 @@ def reap_children():
# Reap all our dead child processes so we don't leave zombies around. # Reap all our dead child processes so we don't leave zombies around.
# These hog resources and might be causing some of the buildbots to die. # These hog resources and might be causing some of the buildbots to die.
import os
if hasattr(os, 'waitpid'): if hasattr(os, 'waitpid'):
any_process = -1 any_process = -1
while True: while True: