]> granicus.if.org Git - python/commitdiff
Get rid of relative imports in all unittests. Now anything that
authorBarry Warsaw <barry@python.org>
Tue, 23 Jul 2002 19:04:11 +0000 (19:04 +0000)
committerBarry Warsaw <barry@python.org>
Tue, 23 Jul 2002 19:04:11 +0000 (19:04 +0000)
imports e.g. test_support must do so using an absolute package name
such as "import test.test_support" or "from test import test_support".

This also updates the README in Lib/test, and gets rid of the
duplicate data dirctory in Lib/test/data (replaced by
Lib/email/test/data).

Now Tim and Jack can have at it. :)

194 files changed:
Lib/email/test/test_email.py
Lib/email/test/test_email_codecs.py
Lib/test/README
Lib/test/data/PyBanner048.gif [deleted file]
Lib/test/data/msg_01.txt [deleted file]
Lib/test/data/msg_02.txt [deleted file]
Lib/test/data/msg_03.txt [deleted file]
Lib/test/data/msg_04.txt [deleted file]
Lib/test/data/msg_05.txt [deleted file]
Lib/test/data/msg_06.txt [deleted file]
Lib/test/data/msg_07.txt [deleted file]
Lib/test/data/msg_08.txt [deleted file]
Lib/test/data/msg_09.txt [deleted file]
Lib/test/data/msg_10.txt [deleted file]
Lib/test/data/msg_11.txt [deleted file]
Lib/test/data/msg_12.txt [deleted file]
Lib/test/data/msg_13.txt [deleted file]
Lib/test/data/msg_14.txt [deleted file]
Lib/test/data/msg_15.txt [deleted file]
Lib/test/data/msg_16.txt [deleted file]
Lib/test/data/msg_17.txt [deleted file]
Lib/test/data/msg_18.txt [deleted file]
Lib/test/data/msg_19.txt [deleted file]
Lib/test/data/msg_20.txt [deleted file]
Lib/test/data/msg_21.txt [deleted file]
Lib/test/data/msg_22.txt [deleted file]
Lib/test/data/msg_23.txt [deleted file]
Lib/test/data/msg_24.txt [deleted file]
Lib/test/data/msg_25.txt [deleted file]
Lib/test/data/msg_26.txt [deleted file]
Lib/test/data/msg_27.txt [deleted file]
Lib/test/data/msg_28.txt [deleted file]
Lib/test/data/msg_29.txt [deleted file]
Lib/test/data/msg_30.txt [deleted file]
Lib/test/regrtest.py
Lib/test/test_StringIO.py
Lib/test/test___future__.py
Lib/test/test_anydbm.py
Lib/test/test_array.py
Lib/test/test_audioop.py
Lib/test/test_base64.py
Lib/test/test_binhex.py
Lib/test/test_binop.py
Lib/test/test_bool.py
Lib/test/test_calendar.py
Lib/test/test_call.py
Lib/test/test_capi.py
Lib/test/test_cmath.py
Lib/test/test_codecs.py
Lib/test/test_codeop.py
Lib/test/test_commands.py
Lib/test/test_compile.py
Lib/test/test_cookie.py
Lib/test/test_copy_reg.py
Lib/test/test_cpickle.py
Lib/test/test_crypt.py
Lib/test/test_curses.py
Lib/test/test_dbm.py
Lib/test/test_descr.py
Lib/test/test_descrtut.py
Lib/test/test_difflib.py
Lib/test/test_dircache.py
Lib/test/test_dl.py
Lib/test/test_doctest.py
Lib/test/test_doctest2.py
Lib/test/test_dospath.py
Lib/test/test_dumbdbm.py
Lib/test/test_enumerate.py
Lib/test/test_errno.py
Lib/test/test_fcntl.py
Lib/test/test_fileinput.py
Lib/test/test_fnmatch.py
Lib/test/test_format.py
Lib/test/test_fpformat.py
Lib/test/test_future.py
Lib/test/test_gc.py
Lib/test/test_gdbm.py
Lib/test/test_generators.py
Lib/test/test_getopt.py
Lib/test/test_glob.py
Lib/test/test_grp.py
Lib/test/test_hash.py
Lib/test/test_hmac.py
Lib/test/test_hotshot.py
Lib/test/test_htmllib.py
Lib/test/test_htmlparser.py
Lib/test/test_imageop.py
Lib/test/test_imgfile.py
Lib/test/test_import.py
Lib/test/test_inspect.py
Lib/test/test_isinstance.py
Lib/test/test_iter.py
Lib/test/test_largefile.py
Lib/test/test_linuxaudiodev.py
Lib/test/test_locale.py
Lib/test/test_long.py
Lib/test/test_long_future.py
Lib/test/test_mailbox.py
Lib/test/test_marshal.py
Lib/test/test_math.py
Lib/test/test_mhlib.py
Lib/test/test_mimetools.py
Lib/test/test_mimetypes.py
Lib/test/test_minidom.py
Lib/test/test_mmap.py
Lib/test/test_module.py
Lib/test/test_mpz.py
Lib/test/test_mutants.py
Lib/test/test_netrc.py
Lib/test/test_new.py
Lib/test/test_nis.py
Lib/test/test_ntpath.py
Lib/test/test_opcodes.py
Lib/test/test_openpty.py
Lib/test/test_operator.py
Lib/test/test_os.py
Lib/test/test_parser.py
Lib/test/test_pickle.py
Lib/test/test_pkg.py
Lib/test/test_pkgimport.py
Lib/test/test_poll.py
Lib/test/test_popen.py
Lib/test/test_popen2.py
Lib/test/test_pow.py
Lib/test/test_pprint.py
Lib/test/test_profilehooks.py
Lib/test/test_pty.py
Lib/test/test_pwd.py
Lib/test/test_pyclbr.py
Lib/test/test_pyexpat.py
Lib/test/test_queue.py
Lib/test/test_quopri.py
Lib/test/test_random.py
Lib/test/test_re.py
Lib/test/test_regex.py
Lib/test/test_repr.py
Lib/test/test_resource.py
Lib/test/test_rfc822.py
Lib/test/test_rgbimg.py
Lib/test/test_richcmp.py
Lib/test/test_robotparser.py
Lib/test/test_sax.py
Lib/test/test_scope.py
Lib/test/test_select.py
Lib/test/test_sgmllib.py
Lib/test/test_sha.py
Lib/test/test_signal.py
Lib/test/test_slice.py
Lib/test/test_socket.py
Lib/test/test_socket_ssl.py
Lib/test/test_socketserver.py
Lib/test/test_softspace.py
Lib/test/test_sre.py
Lib/test/test_strftime.py
Lib/test/test_string.py
Lib/test/test_strop.py
Lib/test/test_struct.py
Lib/test/test_structseq.py
Lib/test/test_sunaudiodev.py
Lib/test/test_sundry.py
Lib/test/test_symtable.py
Lib/test/test_syntax.py
Lib/test/test_thread.py
Lib/test/test_threaded_import.py
Lib/test/test_threadedtempfile.py
Lib/test/test_threading.py
Lib/test/test_time.py
Lib/test/test_timeout.py
Lib/test/test_timing.py
Lib/test/test_tokenize.py
Lib/test/test_traceback.py
Lib/test/test_types.py
Lib/test/test_ucn.py
Lib/test/test_unary.py
Lib/test/test_unicode.py
Lib/test/test_unicode_file.py
Lib/test/test_unicodedata.py
Lib/test/test_univnewlines.py
Lib/test/test_unpack.py
Lib/test/test_urllib.py
Lib/test/test_urllib2.py
Lib/test/test_urlparse.py
Lib/test/test_userdict.py
Lib/test/test_userlist.py
Lib/test/test_userstring.py
Lib/test/test_uu.py
Lib/test/test_wave.py
Lib/test/test_weakref.py
Lib/test/test_winreg.py
Lib/test/test_xmllib.py
Lib/test/test_xmlrpc.py
Lib/test/test_xreadline.py
Lib/test/test_zipfile.py
Lib/test/test_zlib.py

index fc47bca90b6c0c4d94403980fd8ec685406e0d97..734e8549338929d6bd57444bce18b8fb0da4eae5 100644 (file)
@@ -32,7 +32,7 @@ from email import base64MIME
 from email import quopriMIME
 
 from test.test_support import findfile, run_unittest
-from test.test_support import __file__ as test_support_file
+from email.test import __file__ as landmark
 
 
 NL = '\n'
@@ -45,7 +45,7 @@ warnings.filterwarnings('ignore', '', DeprecationWarning, __name__)
 
 \f
 def openfile(filename):
-    path = os.path.join(os.path.dirname(test_support_file), 'data', filename)
+    path = os.path.join(os.path.dirname(landmark), 'data', filename)
     return open(path)
 
 
index 63912efb3788ac3881c8bedbacf6aa880cfccddc..0f681519e424660e6fc9d7a563a3ac369115a867 100644 (file)
@@ -2,7 +2,7 @@
 # email package unit tests for (optional) Asian codecs
 
 import unittest
-from test_support import TestSkipped, run_unittest
+from test.test_support import TestSkipped, run_unittest
 
 from email.test.test_email import TestEmailBase
 from email.Charset import Charset
index 0aa2b1e804e6001fe36627241857d350e477f364..13e740c2e798d51eb6ea7e6a387a2912bc15be7f 100644 (file)
@@ -52,7 +52,7 @@ All PyUnit-based tests in the Python test suite use boilerplate that
 looks like this:
 
     import unittest
-    import test_support
+    from test import test_support
 
     class MyTestCase1(unittest.TestCase):
         # define test methods here...
@@ -248,7 +248,7 @@ these mostly apply only to the "classic" tests; unittest- and doctest-
 based tests should follow the conventions natural to those frameworks):
 
     * If your test case detects a failure, raise TestFailed (found in
-      test_support).
+      test.test_support).
 
     * Import everything you'll need as early as possible.
 
@@ -275,8 +275,16 @@ based tests should follow the conventions natural to those frameworks):
 
 Miscellaneous
 
-There is a test_support module you can import from your test case.  It
-provides the following useful objects:
+There is a test_support module in the test package you can import from
+your test case.  Import this module using either
+
+    import test.test_support
+
+or
+
+    from test import test_support
+
+test_support provides the following useful objects:
 
     * TestFailed - raise this exception when your regression test detects a
       failure.
@@ -318,28 +326,6 @@ provides the following useful objects:
       numbers when you expect them to only be approximately equal withing a
       fuzz factor (test_support.FUZZ, which defaults to 1e-6).
 
-NOTE:  Always import something from test_support like so:
-
-    from test_support import verbose
-
-or like so:
-
-    import test_support
-    ... use test_support.verbose in the code ...
-
-Never import anything from test_support like this:
-
-    from test.test_support import verbose
-
-"test" is a package already, so can refer to modules it contains without
-"test." qualification.  If you do an explicit "test.xxx" qualification, that
-can fool Python into believing test.xxx is a module distinct from the xxx
-in the current package, and you can end up importing two distinct copies of
-xxx.  This is especially bad if xxx=test_support, as regrtest.py can (and
-routinely does) overwrite its "verbose" and "use_large_resources"
-attributes:  if you get a second copy of test_support loaded, it may not
-have the same values for those as regrtest intended.
-
 
 Python and C statement coverage results are currently available at
 
diff --git a/Lib/test/data/PyBanner048.gif b/Lib/test/data/PyBanner048.gif
deleted file mode 100644 (file)
index 1a5c87f..0000000
Binary files a/Lib/test/data/PyBanner048.gif and /dev/null differ
diff --git a/Lib/test/data/msg_01.txt b/Lib/test/data/msg_01.txt
deleted file mode 100644 (file)
index 7e33bcf..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-Return-Path: <bbb@zzz.org>
-Delivered-To: bbb@zzz.org
-Received: by mail.zzz.org (Postfix, from userid 889)
-       id 27CEAD38CC; Fri,  4 May 2001 14:05:44 -0400 (EDT)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Message-ID: <15090.61304.110929.45684@aaa.zzz.org>
-From: bbb@ddd.com (John X. Doe)
-To: bbb@zzz.org
-Subject: This is a test message
-Date: Fri, 4 May 2001 14:05:44 -0400
-
-
-Hi,
-
-Do you like this message?
-
--Me
diff --git a/Lib/test/data/msg_02.txt b/Lib/test/data/msg_02.txt
deleted file mode 100644 (file)
index 43f2480..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-MIME-version: 1.0
-From: ppp-request@zzz.org
-Sender: ppp-admin@zzz.org
-To: ppp@zzz.org
-Subject: Ppp digest, Vol 1 #2 - 5 msgs
-Date: Fri, 20 Apr 2001 20:18:00 -0400 (EDT)
-X-Mailer: Mailman v2.0.4
-X-Mailman-Version: 2.0.4
-Content-Type: multipart/mixed; boundary="192.168.1.2.889.32614.987812255.500.21814"
-
---192.168.1.2.889.32614.987812255.500.21814
-Content-type: text/plain; charset=us-ascii
-Content-description: Masthead (Ppp digest, Vol 1 #2)
-
-Send Ppp mailing list submissions to
-       ppp@zzz.org
-
-To subscribe or unsubscribe via the World Wide Web, visit
-       http://www.zzz.org/mailman/listinfo/ppp
-or, via email, send a message with subject or body 'help' to
-       ppp-request@zzz.org
-
-You can reach the person managing the list at
-       ppp-admin@zzz.org
-
-When replying, please edit your Subject line so it is more specific
-than "Re: Contents of Ppp digest..."
-
-
---192.168.1.2.889.32614.987812255.500.21814
-Content-type: text/plain; charset=us-ascii
-Content-description: Today's Topics (5 msgs)
-
-Today's Topics:
-
-   1. testing #1 (Barry A. Warsaw)
-   2. testing #2 (Barry A. Warsaw)
-   3. testing #3 (Barry A. Warsaw)
-   4. testing #4 (Barry A. Warsaw)
-   5. testing #5 (Barry A. Warsaw)
-
---192.168.1.2.889.32614.987812255.500.21814
-Content-Type: multipart/digest; boundary="__--__--"
-
---__--__--
-
-Message: 1
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Date: Fri, 20 Apr 2001 20:16:13 -0400
-To: ppp@zzz.org
-From: barry@digicool.com (Barry A. Warsaw)
-Subject: [Ppp] testing #1
-Precedence: bulk
-
-
-hello
-
-
---__--__--
-
-Message: 2
-Date: Fri, 20 Apr 2001 20:16:21 -0400
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-To: ppp@zzz.org
-From: barry@digicool.com (Barry A. Warsaw)
-Precedence: bulk
-
-
-hello
-
-
---__--__--
-
-Message: 3
-Date: Fri, 20 Apr 2001 20:16:25 -0400
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-To: ppp@zzz.org
-From: barry@digicool.com (Barry A. Warsaw)
-Subject: [Ppp] testing #3
-Precedence: bulk
-
-
-hello
-
-
---__--__--
-
-Message: 4
-Date: Fri, 20 Apr 2001 20:16:28 -0400
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-To: ppp@zzz.org
-From: barry@digicool.com (Barry A. Warsaw)
-Subject: [Ppp] testing #4
-Precedence: bulk
-
-
-hello
-
-
---__--__--
-
-Message: 5
-Date: Fri, 20 Apr 2001 20:16:32 -0400
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-To: ppp@zzz.org
-From: barry@digicool.com (Barry A. Warsaw)
-Subject: [Ppp] testing #5
-Precedence: bulk
-
-
-hello
-
-
-
-
---__--__----
---192.168.1.2.889.32614.987812255.500.21814
-Content-type: text/plain; charset=us-ascii
-Content-description: Digest Footer
-
-_______________________________________________
-Ppp mailing list
-Ppp@zzz.org
-http://www.zzz.org/mailman/listinfo/ppp
-
-
---192.168.1.2.889.32614.987812255.500.21814--
-
-End of Ppp Digest
-
diff --git a/Lib/test/data/msg_03.txt b/Lib/test/data/msg_03.txt
deleted file mode 100644 (file)
index c748ebf..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Return-Path: <bbb@zzz.org>
-Delivered-To: bbb@zzz.org
-Received: by mail.zzz.org (Postfix, from userid 889)
-       id 27CEAD38CC; Fri,  4 May 2001 14:05:44 -0400 (EDT)
-Message-ID: <15090.61304.110929.45684@aaa.zzz.org>
-From: bbb@ddd.com (John X. Doe)
-To: bbb@zzz.org
-Subject: This is a test message
-Date: Fri, 4 May 2001 14:05:44 -0400
-
-
-Hi,
-
-Do you like this message?
-
--Me
diff --git a/Lib/test/data/msg_04.txt b/Lib/test/data/msg_04.txt
deleted file mode 100644 (file)
index 1f633c4..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-Return-Path: <barry@python.org>
-Delivered-To: barry@python.org
-Received: by mail.python.org (Postfix, from userid 889)
-       id C2BF0D37C6; Tue, 11 Sep 2001 00:05:05 -0400 (EDT)
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="h90VIIIKmx"
-Content-Transfer-Encoding: 7bit
-Message-ID: <15261.36209.358846.118674@anthem.python.org>
-From: barry@python.org (Barry A. Warsaw)
-To: barry@python.org
-Subject: a simple multipart
-Date: Tue, 11 Sep 2001 00:05:05 -0400
-X-Mailer: VM 6.95 under 21.4 (patch 4) "Artificial Intelligence" XEmacs Lucid
-X-Attribution: BAW
-X-Oblique-Strategy: Make a door into a window
-
-
---h90VIIIKmx
-Content-Type: text/plain
-Content-Disposition: inline;
-       filename="msg.txt"
-Content-Transfer-Encoding: 7bit
-
-a simple kind of mirror
-to reflect upon our own
-
---h90VIIIKmx
-Content-Type: text/plain
-Content-Disposition: inline;
-       filename="msg.txt"
-Content-Transfer-Encoding: 7bit
-
-a simple kind of mirror
-to reflect upon our own
-
---h90VIIIKmx--
-
diff --git a/Lib/test/data/msg_05.txt b/Lib/test/data/msg_05.txt
deleted file mode 100644 (file)
index 87d5e9c..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From: foo
-Subject: bar
-To: baz
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-       boundary="D1690A7AC1.996856090/mail.example.com"
-Message-Id: <20010803162810.0CA8AA7ACC@mail.example.com>
-
-This is a MIME-encapsulated message.
-
---D1690A7AC1.996856090/mail.example.com
-Content-Type: text/plain
-
-Yadda yadda yadda
-
---D1690A7AC1.996856090/mail.example.com
-
-Yadda yadda yadda
-
---D1690A7AC1.996856090/mail.example.com
-Content-Type: message/rfc822
-
-From: nobody@python.org
-
-Yadda yadda yadda
-
---D1690A7AC1.996856090/mail.example.com--
-
diff --git a/Lib/test/data/msg_06.txt b/Lib/test/data/msg_06.txt
deleted file mode 100644 (file)
index 69f3a47..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-Return-Path: <barry@python.org>
-Delivered-To: barry@python.org
-MIME-Version: 1.0
-Content-Type: message/rfc822
-Content-Description: forwarded message
-Content-Transfer-Encoding: 7bit
-Message-ID: <15265.9482.641338.555352@python.org>
-From: barry@zope.com (Barry A. Warsaw)
-Sender: barry@python.org
-To: barry@python.org
-Subject: forwarded message from Barry A. Warsaw
-Date: Thu, 13 Sep 2001 17:28:42 -0400
-X-Mailer: VM 6.95 under 21.4 (patch 4) "Artificial Intelligence" XEmacs Lucid
-X-Attribution: BAW
-X-Oblique-Strategy: Be dirty
-X-Url: http://barry.wooz.org
-
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Return-Path: <barry@python.org>
-Delivered-To: barry@python.org
-Message-ID: <15265.9468.713530.98441@python.org>
-From: barry@zope.com (Barry A. Warsaw)
-Sender: barry@python.org
-To: barry@python.org
-Subject: testing
-Date: Thu, 13 Sep 2001 17:28:28 -0400
-X-Mailer: VM 6.95 under 21.4 (patch 4) "Artificial Intelligence" XEmacs Lucid
-X-Attribution: BAW
-X-Oblique-Strategy: Spectrum analysis
-X-Url: http://barry.wooz.org
-
-
diff --git a/Lib/test/data/msg_07.txt b/Lib/test/data/msg_07.txt
deleted file mode 100644 (file)
index 721f3a0..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-MIME-Version: 1.0
-From: Barry <barry@digicool.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Here is your dingus fish
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-Hi there,
-
-This is the dingus fish.
-
---BOUNDARY
-Content-Type: image/gif; name="dingusfish.gif"
-Content-Transfer-Encoding: base64
-content-disposition: attachment; filename="dingusfish.gif"
-
-R0lGODdhAAEAAfAAAP///wAAACwAAAAAAAEAAQAC/oSPqcvtD6OctNqLs968+w+G4kiW5omm6sq2
-7gvH8kzX9o3n+s73/g8MCofEovGITGICTKbyCV0FDNOo9SqpQqpOrJfXzTQj2vD3TGtqL+NtGQ2f
-qTXmxzuOd7WXdcc9DyjU53ewFni4s0fGhdiYaEhGBelICTNoV1j5NUnFcrmUqemjNifJVWpaOqaI
-oFq3SspZsSraE7sHq3jr1MZqWvi662vxV4tD+pvKW6aLDOCLyur8PDwbanyDeq0N3DctbQYeLDvR
-RY6t95m6UB0d3mwIrV7e2VGNvjjffukeJp4w7F65KecGFsTHQGAygOrgrWs1jt28Rc88KESYcGLA
-/obvTkH6p+CinWJiJmIMqXGQwH/y4qk0SYjgQTczT3ajKZGfuI0uJ4kkVI/DT5s3/ejkxI0aT4Y+
-YTYgWbImUaXk9nlLmnSh1qJiJFl0OpUqRK4oOy7NyRQtHWofhoYVxkwWXKUSn0YsS+fUV6lhqfYb
-6ayd3Z5qQdG1B7bvQzaJjwUV2lixMUZ7JVsOlfjWVr/3NB/uFvnySBN6Dcb6rGwaRM3wsormw5cC
-M9NxWy/bWdufudCvy8bOAjXjVVwta/uO21sE5RHBCzNFXtgq9ORtH4eYjVP4Yryo026nvkFmCeyA
-B29efV6ravCMK5JwWd5897Qrx7ll38o6iHDZ/rXPR//feevhF4l7wjUGX3xq1eeRfM4RSJGBIV1D
-z1gKPkfWag3mVBVvva1RlX5bAJTPR/2YqNtw/FkIYYEi/pIZiAdpcxpoHtmnYYoZtvhUftzdx5ZX
-JSKDW405zkGcZzzGZ6KEv4FI224oDmijlEf+xp6MJK5ojY/ASeVUR+wsKRuJ+XFZ5o7ZeEime8t1
-ouUsU6YjF5ZtUihhkGfCdFQLWQFJ3UXxmElfhQnR+eCdcDbkFZp6vTRmj56ApCihn5QGpaToNZmR
-n3NVSpZcQpZ2KEONusaiCsKAug0wkQbJSFO+PTSjneGxOuFjPlUk3ovWvdIerjUg9ZGIOtGq/qeX
-eCYrrCX+1UPsgTKGGRSbzd5q156d/gpfbJxe66eD5iQKrXj7RGgruGxs62qebBHUKS32CKluCiqZ
-qh+pmehmEb71noAUoe5e9Zm17S7773V10pjrtG4CmuurCV/n6zLK5turWNhqOvFXbjhZrMD0YhKe
-wR0zOyuvsh6MWrGoIuzvyWu5y1WIFAqmJselypxXh6dKLNOKEB98L88bS2rkNqqlKzCNJp9c0G0j
-Gzh0iRrCbHSXmPR643QS+4rWhgFmnSbSuXCjS0xAOWkU2UdLqyuUNfHSFdUouy3bm5i5GnDM3tG8
-doJ4r5tqu3pPbRSVfvs8uJzeNXhp3n4j/tZ42SwH7eaWUUOjc3qFV9453UHTXZfcLH+OeNs5g36x
-lBnHvTm7EbMbLeuaLncao8vWCXimfo1o+843Ak6y4ChNeGntvAYvfLK4ezmoyNIbNCLTCXO9ZV3A
-E8/s88RczPzDwI4Ob7XZyl7+9Miban29h+tJZPrE21wgvBphDfrrfPdCTPKJD/y98L1rZwHcV6Jq
-Zab0metpuNIX/qAFPoz171WUaUb4HAhBSzHuHfjzHb3kha/2Cctis/ORArVHNYfFyYRH2pYIRzic
-isVOfPWD1b6mRTqpCRBozzof6UZVvFXRxWIr3GGrEviGYgyPMfahheiSaLs/9QeFu7oZ/ndSY8DD
-ya9x+uPed+7mxN2IzIISBOMLFYWVqC3Pew1T2nFuuCiwZS5/v6II10i4t1OJcUH2U9zxKodHsGGv
-Oa+zkvNUYUOa/TCCRutF9MzDwdlUMJADTCGSbDQ5OV4PTamDoPEi6Ecc/RF5RWwkcdSXvSOaDWSn
-I9LlvubFTQpuc6JKXLcKeb+xdbKRBnwREemXyjg6ME65aJiOuBgrktzykfPLJBKR9ClMavJ62/Ff
-BlNIyod9yX9wcSXexnXFpvkrbXk64xsx5Db7wXKP5fSgsvwIMM/9631VLBfkmtbHRXpqmtei52hG
-pUwSlo+BASQoeILDOBgREECxBBh5/iYmNsQ9dIv5+OI++QkqdsJPc3uykz5fkM+OraeekcQF7X4n
-B5S67za5U967PmooGQhUXfF7afXyCD7ONdRe17QogYjVx38uLwtrS6nhTnm15LQUnu9E2uK6CNI/
-1HOABj0ESwOjut4FEpFQpdNAm4K2LHnDWHNcmKB2ioKBogysVZtMO2nSxUdZ8Yk2kJc7URioLVI0
-YgmtIwZj4LoeKemgnOnbUdGnzZ4Oa6scqiolBGqS6RgWNLu0RMhcaE6rhhU4hiuqFXPAG8fGwTPW
-FKeLMtdVmXLSs5YJGF/YeVm7rREMlY3UYE+yCxbaMXX8y15m5zVHq6GOKDMynzII/jdUHdyVqIy0
-ifX2+r/EgtZcvRzSb72gU9ui87M2VecjKildW/aFqaYhKoryUjfB/g4qtyVuc60xFDGmCxwjW+qu
-zjuwl2GkOWn66+3QiiEctvd04OVvcCVzjgT7lrkvjVGKKHmmlDUKowSeikb5kK/mJReuWOxONx+s
-ULsl+Lqb0CVn0SrVyJ6wt4t6yTeSCafhPhAf0OXn6L60UMxiLolFAtmN35S2Ob1lZpQ1r/n0Qb5D
-oQ1zJiRVDgF8N3Q8TYfbi3DyWCy3lT1nxyBs6FT3S2GOzWRlxwKvlRP0RPJA9SjxEy0UoEnkA+M4
-cnzLMJrBGWLFEaaUb5lvpqbq/loOaU5+DFuHPxo82/OZuM8FXG3oVNZhtWpMpb/0Xu5m/LfLhHZQ
-7yuVI0MqZ7NE43imC8jH3IwGZlbPm0xkJYs7+2U48hXTsFSMqgGDvai0kLxyynKNT/waj+q1c1tz
-GjOpPBgdCSq3UKZxCSsqFIY+O6JbAWGWcV1pwqLyj5sGqCF1xb1F3varUWqrJv6cN3PrUXzijtfZ
-FshpBL3Xwr4GIPvU2N8EjrJgS1zl21rbXQMXeXc5jjFyrhpCzijSv/RQtyPSzHCFMhlME95fHglt
-pRsX+dfSQjUeHAlpWzJ5iOo79Ldnaxai6bXTcGO3fp07ri7HLEmXXPlYi8bv/qVxvNcdra6m7Rlb
-6JBTb5fd66VhFRjGArh2n7R1rDW4P5NOT9K0I183T2scYkeZ3q/VFyLb09U9ajzXBS8Kgkhc4mBS
-kYY9cy3Vy9lUnuNJH8HGIclUilwnBtjUOH0gteGOZ4c/XNrhXLSYDyxfnD8z1pDy7rYRvDolhnbe
-UMzxCZUs40s6s7UIvBnLgc0+vKuOkIXeOrDymlp+Zxra4MZLBbVrqD/jTJ597pDmnw5c4+DbyB88
-9Cg9DodYcSuMZT/114pptqc/EuTjRPvH/z5slzI3tluOEBBLqOXLOX+0I5929tO97wkvl/atCz+y
-xJrdwteW2FNW/NSmBP+f/maYtVs/bYyBC7Ox3jsYZHL05CIrBa/nS+b3bHfiYm4Ueil1YZZSgAUI
-fFZ1dxUmeA2oQRQ3RuGXNGLFV9/XbGFGPV6kfzk1TBBCd+izc7q1H+OHMJwmaBX2IQNYVAKHYepV
-SSGCe6CnbYHHETKGNe43EDvFgZr0gB/nVHPHZ80VV1ojOiI3XDvYIkl4ayo4bxQIgrFXWTvBI0nH
-VElWMuw2aLUWCRHHf8ymVCHjFlJnOSojfevCYyyyZDH0IcvHhrsnQ5O1OsWzONuVVKIxSxiFZ/tR
-fKDAf6xFTnw4O9Qig2VCfW2hJQrmMOuHW0W3dLQmCMO2ccdUd/xyfflH/olTiHZVdGwb8nIwRzSE
-J15jFlOJuBZBZ4CiyHyd2IFylFlB+HgHhYabhWOGwYO1ZH/Og1dtQlFMk352CGRSIFTapnWQEUtN
-l4zv8S0aaCFDyGCBqDUxZYpxGHX01y/JuH1xhn7TOCnNCI4eKDs5WGX4R425F4vF1o3BJ4vO0otq
-I3rimI7jJY1jISqnBxknCIvruF83mF5wN4X7qGLIhR8A2Vg0yFERSIXn9Vv3GHy3Vj/WIkKddlYi
-yIMv2I/VMjTLpW7pt05SWIZR0RPyxpB4SIUM9lBPGBl0GC7oSEEwRYLe4pJpZY2P0zbI1n+Oc44w
-qY3PUnmF0ixjVpDD/mJ9wpOBGTVgXlaCaZiPcIWK5NiKBIiPdGaQ0TWGvAiG7nMchdZb7Vgf8zNi
-MuMyzRdy/lePe9iC4TRx7WhhOQI/QiSVNAmAa2lT/piFbuh7ofJoYSZzrSZ1bvmWw3eN2nKUPVky
-uPN5/VRfohRd0VYZoqhKIlU6TXYhJxmPUIloAwc1bPmHEpaZYZORHNlXUJM07hATwHR8MJYqkwWR
-WaIezFhxSFlc8/Fq82hEnpeRozg3ULhhr9lAGtVEkCg5ZNRuuVleBPaZadhG0ZgkyPmDOTOKzViM
-YgOcpukKqQcbjAWS0IleQ2ROjdh6A+md1qWdBRSX7iSYgFRTtRmBpJioieXJiHfJiMGIR9fJOn8I
-MSfXYhspn4ooSa2mSAj4n+8Bmg03fBJZoPOJgsVZRxu1oOMRPXYYjdqjihFaEoZpXBREanuJoRI6
-cibFinq4ngUKh/wQd/H5ofYCZ0HJXR62opZFaAT0iFIZo4DIiUojkjeqKiuoZirKo5Y1a7AWckGa
-BkuYoD5lpDK6eUs6CkDqpETwl1EqpfhJpVeKpVl6EgUAADs=
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_08.txt b/Lib/test/data/msg_08.txt
deleted file mode 100644 (file)
index b563083..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-MIME-Version: 1.0
-From: Barry Warsaw <barry@zope.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Lyrics
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-
---BOUNDARY
-Content-Type: text/html; charset="iso-8859-1"
-
-
---BOUNDARY
-Content-Type: text/plain; charset="iso-8859-2"
-
-
---BOUNDARY
-Content-Type: text/plain; charset="koi8-r"
-
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_09.txt b/Lib/test/data/msg_09.txt
deleted file mode 100644 (file)
index 575c4c2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-MIME-Version: 1.0
-From: Barry Warsaw <barry@zope.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Lyrics
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-
---BOUNDARY
-Content-Type: text/html; charset="iso-8859-1"
-
-
---BOUNDARY
-Content-Type: text/plain
-
-
---BOUNDARY
-Content-Type: text/plain; charset="koi8-r"
-
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_10.txt b/Lib/test/data/msg_10.txt
deleted file mode 100644 (file)
index bd30d13..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-MIME-Version: 1.0
-From: Barry Warsaw <barry@zope.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Lyrics
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
-This is a 7bit encoded message.
-
---BOUNDARY
-Content-Type: text/html; charset="iso-8859-1"
-Content-Transfer-Encoding: Quoted-Printable
-
-=A1This is a Quoted Printable encoded message!
-
---BOUNDARY
-Content-Type: text/plain; charset="iso-8859-1"
-Content-Transfer-Encoding: Base64
-
-VGhpcyBpcyBhIEJhc2U2NCBlbmNvZGVkIG1lc3NhZ2Uu
-
-
---BOUNDARY
-Content-Type: text/plain; charset="iso-8859-1"
-
-This has no Content-Transfer-Encoding: header.
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_11.txt b/Lib/test/data/msg_11.txt
deleted file mode 100644 (file)
index 8f7f199..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Content-Type: message/rfc822
-MIME-Version: 1.0
-Subject: The enclosing message
-
-Subject: An enclosed message
-
-Here is the body of the message.
diff --git a/Lib/test/data/msg_12.txt b/Lib/test/data/msg_12.txt
deleted file mode 100644 (file)
index 4bec8d9..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-MIME-Version: 1.0
-From: Barry Warsaw <barry@zope.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Lyrics
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-
---BOUNDARY
-Content-Type: text/html; charset="iso-8859-1"
-
-
---BOUNDARY
-Content-Type: multipart/mixed; boundary="ANOTHER"
-
---ANOTHER
-Content-Type: text/plain; charset="iso-8859-2"
-
-
---ANOTHER
-Content-Type: text/plain; charset="iso-8859-3"
-
---ANOTHER--
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-
---BOUNDARY
-Content-Type: text/plain; charset="koi8-r"
-
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_13.txt b/Lib/test/data/msg_13.txt
deleted file mode 100644 (file)
index 8e6d52d..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-MIME-Version: 1.0
-From: Barry <barry@digicool.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Here is your dingus fish
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="OUTER"
-
---OUTER
-Content-Type: text/plain; charset="us-ascii"
-
-A text/plain part
-
---OUTER
-Content-Type: multipart/mixed; boundary=BOUNDARY
-
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-
-Hi there,
-
-This is the dingus fish.
-
---BOUNDARY
-Content-Type: image/gif; name="dingusfish.gif"
-Content-Transfer-Encoding: base64
-content-disposition: attachment; filename="dingusfish.gif"
-
-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
-
---BOUNDARY--
-
---OUTER--
diff --git a/Lib/test/data/msg_14.txt b/Lib/test/data/msg_14.txt
deleted file mode 100644 (file)
index 5d98d2f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Return-Path: <bbb@zzz.org>
-Delivered-To: bbb@zzz.org
-Received: by mail.zzz.org (Postfix, from userid 889)
-       id 27CEAD38CC; Fri,  4 May 2001 14:05:44 -0400 (EDT)
-MIME-Version: 1.0
-Content-Type: text; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Message-ID: <15090.61304.110929.45684@aaa.zzz.org>
-From: bbb@ddd.com (John X. Doe)
-To: bbb@zzz.org
-Subject: This is a test message
-Date: Fri, 4 May 2001 14:05:44 -0400
-
-
-Hi,
-
-I'm sorry but I'm using a drainbread ISP, which although big and
-wealthy can't seem to generate standard compliant email. :(
-
-This message has a Content-Type: header with no subtype.  I hope you
-can still read it.
-
--Me
diff --git a/Lib/test/data/msg_15.txt b/Lib/test/data/msg_15.txt
deleted file mode 100644 (file)
index 33b8487..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-Return-Path: <xx@xx.dk>
-Received: from fepD.post.tele.dk (195.41.46.149) by mail.groupcare.dk (LSMTP for Windows NT v1.1b) with SMTP id <0.0014F8A2@mail.groupcare.dk>; Mon, 30 Apr 2001 12:17:50 +0200
-User-Agent: Microsoft-Outlook-Express-Macintosh-Edition/5.02.2106
-Subject: XX
-From: xx@xx.dk
-To: XX
-Message-ID: <xxxx>
-Mime-version: 1.0
-Content-type: multipart/mixed;
-   boundary="MS_Mac_OE_3071477847_720252_MIME_Part"
-
-> Denne meddelelse er i MIME-format. Da dit postl¾sningsprogram ikke forst\8cr dette format, kan del af eller hele meddelelsen v¾re ul¾selig.
-
---MS_Mac_OE_3071477847_720252_MIME_Part
-Content-type: multipart/alternative;
-   boundary="MS_Mac_OE_3071477847_720252_MIME_Part"
-
-
---MS_Mac_OE_3071477847_720252_MIME_Part
-Content-type: text/plain; charset="ISO-8859-1"
-Content-transfer-encoding: quoted-printable
-
-Some removed test. 
-
---MS_Mac_OE_3071477847_720252_MIME_Part
-Content-type: text/html; charset="ISO-8859-1"
-Content-transfer-encoding: quoted-printable
-
-<HTML>
-<HEAD>
-<TITLE>Some removed HTML</TITLE>
-</HEAD>
-<BODY>
-Some removed text.
-</BODY>
-</HTML>
-
-
---MS_Mac_OE_3071477847_720252_MIME_Part--
-
-
---MS_Mac_OE_3071477847_720252_MIME_Part
-Content-type: image/gif; name="xx.gif";
- x-mac-creator="6F676C65";
- x-mac-type="47494666"
-Content-disposition: attachment
-Content-transfer-encoding: base64
-
-Some removed base64 encoded chars.
-
---MS_Mac_OE_3071477847_720252_MIME_Part--
-
diff --git a/Lib/test/data/msg_16.txt b/Lib/test/data/msg_16.txt
deleted file mode 100644 (file)
index 56167e9..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-Return-Path: <>
-Delivered-To: scr-admin@socal-raves.org
-Received: from cougar.noc.ucla.edu (cougar.noc.ucla.edu [169.232.10.18])
-       by babylon.socal-raves.org (Postfix) with ESMTP id CCC2C51B84
-       for <scr-admin@socal-raves.org>; Sun, 23 Sep 2001 20:13:54 -0700 (PDT)
-Received: from sims-ms-daemon by cougar.noc.ucla.edu
- (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
- id <0GK500B01D0B8Y@cougar.noc.ucla.edu> for scr-admin@socal-raves.org; Sun,
- 23 Sep 2001 20:14:35 -0700 (PDT)
-Received: from cougar.noc.ucla.edu
- (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
- id <0GK500B01D0B8X@cougar.noc.ucla.edu>; Sun, 23 Sep 2001 20:14:35 -0700 (PDT)
-Date: Sun, 23 Sep 2001 20:14:35 -0700 (PDT)
-From: Internet Mail Delivery <postmaster@ucla.edu>
-Subject: Delivery Notification: Delivery has failed
-To: scr-admin@socal-raves.org
-Message-id: <0GK500B04D0B8X@cougar.noc.ucla.edu>
-MIME-version: 1.0
-Sender: scr-owner@socal-raves.org
-Errors-To: scr-owner@socal-raves.org
-X-BeenThere: scr@socal-raves.org
-X-Mailman-Version: 2.1a3
-Precedence: bulk
-List-Help: <mailto:scr-request@socal-raves.org?subject=help>
-List-Post: <mailto:scr@socal-raves.org>
-List-Subscribe: <http://socal-raves.org/mailman/listinfo/scr>,
-       <mailto:scr-request@socal-raves.org?subject=subscribe>
-List-Id: SoCal-Raves <scr.socal-raves.org>
-List-Unsubscribe: <http://socal-raves.org/mailman/listinfo/scr>,
-       <mailto:scr-request@socal-raves.org?subject=unsubscribe>
-List-Archive: <http://socal-raves.org/mailman/private/scr/>
-Content-Type: multipart/report; boundary="Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)"
-
-
---Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
-Content-type: text/plain; charset=ISO-8859-1
-
-This report relates to a message you sent with the following header fields:
-
-  Message-id: <002001c144a6$8752e060$56104586@oxy.edu>
-  Date: Sun, 23 Sep 2001 20:10:55 -0700
-  From: "Ian T. Henry" <henryi@oxy.edu>
-  To: SoCal Raves <scr@socal-raves.org>
-  Subject: [scr] yeah for Ians!!
-
-Your message cannot be delivered to the following recipients:
-
-  Recipient address: jangel1@cougar.noc.ucla.edu
-  Reason: recipient reached disk quota
-
-
---Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
-Content-type: message/DELIVERY-STATUS
-
-Original-envelope-id: 0GK500B4HD0888@cougar.noc.ucla.edu
-Reporting-MTA: dns; cougar.noc.ucla.edu
-
-Action: failed
-Status: 5.0.0 (recipient reached disk quota)
-Original-recipient: rfc822;jangel1@cougar.noc.ucla.edu
-Final-recipient: rfc822;jangel1@cougar.noc.ucla.edu
-
---Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
-Content-type: MESSAGE/RFC822
-
-Return-path: scr-admin@socal-raves.org
-Received: from sims-ms-daemon by cougar.noc.ucla.edu
- (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
- id <0GK500B01D0B8X@cougar.noc.ucla.edu>; Sun, 23 Sep 2001 20:14:35 -0700 (PDT)
-Received: from panther.noc.ucla.edu by cougar.noc.ucla.edu
- (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
- with ESMTP id <0GK500B4GD0888@cougar.noc.ucla.edu> for jangel1@sims-ms-daemon;
- Sun, 23 Sep 2001 20:14:33 -0700 (PDT)
-Received: from babylon.socal-raves.org
- (ip-209-85-222-117.dreamhost.com [209.85.222.117])
- by panther.noc.ucla.edu (8.9.1a/8.9.1) with ESMTP id UAA09793 for
- <jangel1@ucla.edu>; Sun, 23 Sep 2001 20:14:32 -0700 (PDT)
-Received: from babylon (localhost [127.0.0.1]) by babylon.socal-raves.org
- (Postfix) with ESMTP id D3B2951B70; Sun, 23 Sep 2001 20:13:47 -0700 (PDT)
-Received: by babylon.socal-raves.org (Postfix, from userid 60001)
- id A611F51B82; Sun, 23 Sep 2001 20:13:46 -0700 (PDT)
-Received: from tiger.cc.oxy.edu (tiger.cc.oxy.edu [134.69.3.112])
- by babylon.socal-raves.org (Postfix) with ESMTP id ADA7351B70 for
- <scr@socal-raves.org>; Sun, 23 Sep 2001 20:13:44 -0700 (PDT)
-Received: from ent (n16h86.dhcp.oxy.edu [134.69.16.86])
- by tiger.cc.oxy.edu (8.8.8/8.8.8) with SMTP id UAA08100 for
- <scr@socal-raves.org>; Sun, 23 Sep 2001 20:14:24 -0700 (PDT)
-Date: Sun, 23 Sep 2001 20:10:55 -0700
-From: "Ian T. Henry" <henryi@oxy.edu>
-Subject: [scr] yeah for Ians!!
-Sender: scr-admin@socal-raves.org
-To: SoCal Raves <scr@socal-raves.org>
-Errors-to: scr-admin@socal-raves.org
-Message-id: <002001c144a6$8752e060$56104586@oxy.edu>
-MIME-version: 1.0
-X-Mailer: Microsoft Outlook Express 5.50.4522.1200
-Content-type: text/plain; charset=us-ascii
-Precedence: bulk
-Delivered-to: scr-post@babylon.socal-raves.org
-Delivered-to: scr@socal-raves.org
-X-Converted-To-Plain-Text: from multipart/alternative by demime 0.98e
-X-Converted-To-Plain-Text: Alternative section used was text/plain
-X-BeenThere: scr@socal-raves.org
-X-Mailman-Version: 2.1a3
-List-Help: <mailto:scr-request@socal-raves.org?subject=help>
-List-Post: <mailto:scr@socal-raves.org>
-List-Subscribe: <http://socal-raves.org/mailman/listinfo/scr>,
- <mailto:scr-request@socal-raves.org?subject=subscribe>
-List-Id: SoCal-Raves <scr.socal-raves.org>
-List-Unsubscribe: <http://socal-raves.org/mailman/listinfo/scr>,
- <mailto:scr-request@socal-raves.org?subject=unsubscribe>
-List-Archive: <http://socal-raves.org/mailman/private/scr/>
-
-I always love to find more Ian's that are over 3 years old!!
-
-Ian
-_______________________________________________
-For event info, list questions, or to unsubscribe, see http://www.socal-raves.org/
-
-
-
---Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)--
-
diff --git a/Lib/test/data/msg_17.txt b/Lib/test/data/msg_17.txt
deleted file mode 100644 (file)
index 8d86e41..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-MIME-Version: 1.0
-From: Barry <barry@digicool.com>
-To: Dingus Lovers <cravindogs@cravindogs.com>
-Subject: Here is your dingus fish
-Date: Fri, 20 Apr 2001 19:35:02 -0400
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
-Hi there,
-
-This is the dingus fish.
-
-[Non-text (image/gif) part of message omitted, filename dingusfish.gif]
diff --git a/Lib/test/data/msg_18.txt b/Lib/test/data/msg_18.txt
deleted file mode 100644 (file)
index f9f4904..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
-       spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"
-
diff --git a/Lib/test/data/msg_19.txt b/Lib/test/data/msg_19.txt
deleted file mode 100644 (file)
index 49bf7fc..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-Send Ppp mailing list submissions to
-       ppp@zzz.org
-
-To subscribe or unsubscribe via the World Wide Web, visit
-       http://www.zzz.org/mailman/listinfo/ppp
-or, via email, send a message with subject or body 'help' to
-       ppp-request@zzz.org
-
-You can reach the person managing the list at
-       ppp-admin@zzz.org
-
-When replying, please edit your Subject line so it is more specific
-than "Re: Contents of Ppp digest..."
-
-Today's Topics:
-
-   1. testing #1 (Barry A. Warsaw)
-   2. testing #2 (Barry A. Warsaw)
-   3. testing #3 (Barry A. Warsaw)
-   4. testing #4 (Barry A. Warsaw)
-   5. testing #5 (Barry A. Warsaw)
-
-hello
-
-
-hello
-
-
-hello
-
-
-hello
-
-
-hello
-
-
-
-_______________________________________________
-Ppp mailing list
-Ppp@zzz.org
-http://www.zzz.org/mailman/listinfo/ppp
-
diff --git a/Lib/test/data/msg_20.txt b/Lib/test/data/msg_20.txt
deleted file mode 100644 (file)
index 1a6a887..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Return-Path: <bbb@zzz.org>
-Delivered-To: bbb@zzz.org
-Received: by mail.zzz.org (Postfix, from userid 889)
-       id 27CEAD38CC; Fri,  4 May 2001 14:05:44 -0400 (EDT)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Message-ID: <15090.61304.110929.45684@aaa.zzz.org>
-From: bbb@ddd.com (John X. Doe)
-To: bbb@zzz.org
-Cc: ccc@zzz.org
-CC: ddd@zzz.org
-cc: eee@zzz.org
-Subject: This is a test message
-Date: Fri, 4 May 2001 14:05:44 -0400
-
-
-Hi,
-
-Do you like this message?
-
--Me
diff --git a/Lib/test/data/msg_21.txt b/Lib/test/data/msg_21.txt
deleted file mode 100644 (file)
index 5b2e777..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: aperson@dom.ain
-To: bperson@dom.ain
-Subject: Test
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
-MIME message
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-
-One
-
---BOUNDARY
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-
-Two
-
---BOUNDARY--
-End of MIME message
diff --git a/Lib/test/data/msg_22.txt b/Lib/test/data/msg_22.txt
deleted file mode 100644 (file)
index af9de5f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-Mime-Version: 1.0
-Message-Id: <a05001902b7f1c33773e9@[134.84.183.138]>
-Date: Tue, 16 Oct 2001 13:59:25 +0300
-To: a@example.com
-From: b@example.com
-Content-Type: multipart/mixed; boundary="============_-1208892523==_============"
-
---============_-1208892523==_============
-Content-Type: text/plain; charset="us-ascii" ; format="flowed"
-
-Text text text.
---============_-1208892523==_============
-Content-Id: <a05001902b7f1c33773e9@[134.84.183.138].0.0>
-Content-Type: image/jpeg; name="wibble.JPG"
- ; x-mac-type="4A504547"
- ; x-mac-creator="474B4F4E"
-Content-Disposition: attachment; filename="wibble.JPG"
-Content-Transfer-Encoding: base64
-
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAALCAXABIEBAREA
-g6bCjjw/pIZSjO6FWFpldjySOmCNrO7DBZibUXhTwtCixw+GtAijVdqxxaPp0aKvmGXa
-qrbBQvms0mAMeYS/3iTV1dG0hHaRNK01XblnWxtVdjkHLMIgTyqnk9VB7CrP2KzIINpa
-4O7I+zxYO9WV8jZg71Zlb+8rMDkEirAVQFAUAKAFAAAUAYAUDgADgY6DjpRtXj5RxjHA
-4wQRj0wQCMdCAewpaKKK/9k=
---============_-1208892523==_============
-Content-Id: <a05001902b7f1c33773e9@[134.84.183.138].0.1>
-Content-Type: image/jpeg; name="wibble2.JPG"
- ; x-mac-type="4A504547"
- ; x-mac-creator="474B4F4E"
-Content-Disposition: attachment; filename="wibble2.JPG"
-Content-Transfer-Encoding: base64
-
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAALCAXABJ0BAREA
-/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA
-W6NFJJBEkU10kKGTcWMDwxuU+0JHvk8qAtOpNwqSR0n8c3BlDyXHlqsUltHEiTvdXLxR
-7vMiGDNJAJWkAMk8ZkCFp5G2oo5W++INrbQtNfTQxJAuXlupz9oS4d5Y1W+E2XlWZJJE
-Y7LWYQxTLE1zuMbfBPxw8X2fibVdIbSbI6nLZxX635t9TjtYreWR7WGKJTLJFFKSlozO
-0ShxIXM43uC3/9k=
---============_-1208892523==_============
-Content-Type: text/plain; charset="us-ascii" ; format="flowed"
-
-Text text text.
---============_-1208892523==_============--
-
diff --git a/Lib/test/data/msg_23.txt b/Lib/test/data/msg_23.txt
deleted file mode 100644 (file)
index bb2e8ec..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-From: aperson@dom.ain
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-
---BOUNDARY
-Content-Type: text/plain
-
-A message part
---BOUNDARY--
diff --git a/Lib/test/data/msg_24.txt b/Lib/test/data/msg_24.txt
deleted file mode 100644 (file)
index 4e52339..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Content-Type: multipart/mixed; boundary="BOUNDARY"
-MIME-Version: 1.0
-Subject: A subject
-To: aperson@dom.ain
-From: bperson@dom.ain
-
---BOUNDARY
-
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_25.txt b/Lib/test/data/msg_25.txt
deleted file mode 100644 (file)
index 9e35275..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-From MAILER-DAEMON Fri Apr 06 16:46:09 2001
-Received: from [204.245.199.98] (helo=zinfandel.lacita.com)
-       by www.linux.org.uk with esmtp (Exim 3.13 #1)
-       id 14lYR6-0008Iv-00
-       for linuxuser-admin@www.linux.org.uk; Fri, 06 Apr 2001 16:46:09 +0100
-Received: from localhost (localhost) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with internal id JAB03225; Fri, 6 Apr 2001 09:23:06 -0800 (GMT-0800)
-Date: Fri, 6 Apr 2001 09:23:06 -0800 (GMT-0800)
-From: Mail Delivery Subsystem <MAILER-DAEMON@zinfandel.lacita.com>
-Subject: Returned mail: Too many hops 19 (17 max): from <linuxuser-admin@www.linux.org.uk> via [199.164.235.226], to <scoffman@wellpartner.com>
-Message-Id: <200104061723.JAB03225@zinfandel.lacita.com>
-To: <linuxuser-admin@www.linux.org.uk>
-To: postmaster@zinfandel.lacita.com
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-       bo
-Auto-Submitted: auto-generated (failure)
-
-This is a MIME-encapsulated message
-
---JAB03225.986577786/zinfandel.lacita.com
-
-The original message was received at Fri, 6 Apr 2001 09:23:03 -0800 (GMT-0800)
-from [199.164.235.226]
-
-   ----- The following addresses have delivery notifications -----
-<scoffman@wellpartner.com>  (unrecoverable error)
-
-   ----- Transcript of session follows -----
-554 Too many hops 19 (17 max): from <linuxuser-admin@www.linux.org.uk> via [199.164.235.226], to <scoffman@wellpartner.com>
-
---JAB03225.986577786/zinfandel.lacita.com
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; zinfandel.lacita.com
-Received-From-MTA: dns; [199.164.235.226]
-Arrival-Date: Fri, 6 Apr 2001 09:23:03 -0800 (GMT-0800)
-
-Final-Recipient: rfc822; scoffman@wellpartner.com
-Action: failed
-Status: 5.4.6
-Last-Attempt-Date: Fri, 6 Apr 2001 09:23:06 -0800 (GMT-0800)
-
---JAB03225.986577786/zinfandel.lacita.com
-Content-Type: text/rfc822-headers
-
-Return-Path: linuxuser-admin@www.linux.org.uk
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03225 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:23:03 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03221 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:22:18 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03217 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:21:37 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03213 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:20:56 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03209 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:20:15 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03205 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:19:33 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03201 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:18:52 -0800 (GMT-0800)
-Received: from zinfandel.lacita.com ([204.245.199.98])
-       by
-       fo
-Received: from ns1.wellpartner.net ([199.164.235.226]) by zinfandel.lacita.com (8.7.3/8.6.10-MT4.00) with ESMTP id JAA03197 for <scoffman@wellpartner.com>; Fri, 6 Apr 2001 09:17:54 -0800 (GMT-0800)
-Received: from www.linux.org.uk (parcelfarce.linux.theplanet.co.uk [195.92.249.252])
-       by
-       fo
-Received: from localhost.localdomain
-       ([
-       by
-       id
-Received: from [212.1.130.11] (helo=s1.uklinux.net ident=root)
-       by
-       id
-       fo
-Received: from server (ppp-2-22.cvx4.telinco.net [212.1.149.22])
-       by
-       fo
-From: Daniel James <daniel@linuxuser.co.uk>
-Organization: LinuxUser
-To: linuxuser@www.linux.org.uk
-X-Mailer: KMail [version 1.1.99]
-Content-Type: text/plain;
-  c
-MIME-Version: 1.0
-Message-Id: <01040616033903.00962@server>
-Content-Transfer-Encoding: 8bit
-Subject: [LinuxUser] bulletin no. 45
-Sender: linuxuser-admin@www.linux.org.uk
-Errors-To: linuxuser-admin@www.linux.org.uk
-X-BeenThere: linuxuser@www.linux.org.uk
-X-Mailman-Version: 2.0.3
-Precedence: bulk
-List-Help: <mailto:linuxuser-request@www.linux.org.uk?subject=help>
-List-Post: <mailto:linuxuser@www.linux.org.uk>
-List-Subscribe: <http://www.linux.org.uk/mailman/listinfo/linuxuser>,
-       <m
-List-Id: bulletins from LinuxUser magazine <linuxuser.www.linux.org.uk>
-List-Unsubscribe: <http://www.linux.org.uk/mailman/listinfo/linuxuser>,
-       <m
-List-Archive: <http://www.linux.org.uk/pipermail/linuxuser/>
-Date: Fri, 6 Apr 2001 16:03:39 +0100
-
---JAB03225.986577786/zinfandel.lacita.com--
-
-
diff --git a/Lib/test/data/msg_26.txt b/Lib/test/data/msg_26.txt
deleted file mode 100644 (file)
index 292197b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-Received: from xcar [192.168.0.2] by jeeves.wooster.local
-  (SMTPD32-7.07 EVAL) id AFF92F0214; Sun, 12 May 2002 08:55:37 +0100
-Date: Sun, 12 May 2002 08:56:15 +0100
-From: Father Time <father.time@xcar.wooster.local>
-To: timbo@jeeves.wooster.local
-Subject: IMAP file test
-Message-ID: <6df65d354b.father.time@rpc.wooster.local>
-X-Organization: Home
-User-Agent: Messenger-Pro/2.50a (MsgServe/1.50) (RISC-OS/4.02) POPstar/2.03
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="1618492860--2051301190--113853680"
-Status: R
-X-UIDL: 319998302
-
-This message is in MIME format which your mailer apparently does not support.
-You either require a newer version of your software which supports MIME, or
-a separate MIME decoding utility.  Alternatively, ask the sender of this
-message to resend it in a different format.
-
---1618492860--2051301190--113853680
-Content-Type: text/plain; charset=us-ascii
-
-Simple email with attachment.
-
-
---1618492860--2051301190--113853680
-Content-Type: application/riscos; name="clock.bmp,69c"; type=BMP; load=&fff69c4b; exec=&355dd4d1; access=&03
-Content-Disposition: attachment; filename="clock.bmp"
-Content-Transfer-Encoding: base64
-
-Qk12AgAAAAAAAHYAAAAoAAAAIAAAACAAAAABAAQAAAAAAAAAAADXDQAA1w0AAAAAAAAA
-AAAAAAAAAAAAiAAAiAAAAIiIAIgAAACIAIgAiIgAALu7uwCIiIgAERHdACLuIgAz//8A
-zAAAAN0R3QDu7iIA////AAAAAAAAAAAAAAAAAAAAAAAAAAi3AAAAAAAAADeAAAAAAAAA
-C3ADMzMzMANwAAAAAAAAAAAHMAAAAANwAAAAAAAAAACAMAd3zPfwAwgAAAAAAAAIAwd/
-f8x/f3AwgAAAAAAAgDB0x/f3//zPAwgAAAAAAAcHfM9////8z/AwAAAAAAiwd/f3////
-////A4AAAAAAcEx/f///////zAMAAAAAiwfM9////3///8zwOAAAAAcHf3////B/////
-8DAAAAALB/f3///wd3d3//AwAAAABwTPf//wCQAAD/zAMAAAAAsEx/f///B////8wDAA
-AAAHB39////wf/////AwAAAACwf39///8H/////wMAAAAIcHfM9///B////M8DgAAAAA
-sHTH///wf///xAMAAAAACHB3f3//8H////cDgAAAAAALB3zH//D//M9wMAAAAAAAgLB0
-z39///xHAwgAAAAAAAgLB3d3RHd3cDCAAAAAAAAAgLAHd0R3cAMIAAAAAAAAgAgLcAAA
-AAMwgAgAAAAACDAAAAu7t7cwAAgDgAAAAABzcIAAAAAAAAgDMwAAAAAAN7uwgAAAAAgH
-MzMAAAAACH97tzAAAAALu3c3gAAAAAAL+7tzDABAu7f7cAAAAAAACA+3MA7EQAv/sIAA
-AAAAAAAIAAAAAAAAAIAAAAAA
-
---1618492860--2051301190--113853680--
diff --git a/Lib/test/data/msg_27.txt b/Lib/test/data/msg_27.txt
deleted file mode 100644 (file)
index d019176..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Return-Path: <aperson@dom.ain>
-Received: by mail.dom.ain (Postfix, from userid 889)
-       id B9D0AD35DB; Tue,  4 Jun 2002 21:46:59 -0400 (EDT)
-Message-ID: <15613.28051.707126.569693@dom.ain>
-Date: Tue, 4 Jun 2002 21:46:59 -0400
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Subject: bug demonstration
-       12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789
-       more text
-From: aperson@dom.ain (Anne P. Erson)
-To: bperson@dom.ain (Barney P. Erson)
-
-test
diff --git a/Lib/test/data/msg_28.txt b/Lib/test/data/msg_28.txt
deleted file mode 100644 (file)
index 1e4824c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From: aperson@dom.ain
-MIME-Version: 1.0
-Content-Type: multipart/digest; boundary=BOUNDARY
-
---BOUNDARY
-Content-Type: message/rfc822
-
-Content-Type: text/plain; charset=us-ascii
-To: aa@bb.org
-From: cc@dd.org
-Subject: ee
-
-message 1
-
---BOUNDARY
-Content-Type: message/rfc822
-
-Content-Type: text/plain; charset=us-ascii
-To: aa@bb.org
-From: cc@dd.org
-Subject: ee
-
-message 2
-
---BOUNDARY--
diff --git a/Lib/test/data/msg_29.txt b/Lib/test/data/msg_29.txt
deleted file mode 100644 (file)
index 1fab561..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Return-Path: <bbb@zzz.org>
-Delivered-To: bbb@zzz.org
-Received: by mail.zzz.org (Postfix, from userid 889)
-       id 27CEAD38CC; Fri,  4 May 2001 14:05:44 -0400 (EDT)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii;
-     title*0*="us-ascii'en'This%20is%20even%20more%20";
-     title*1*="%2A%2A%2Afun%2A%2A%2A%20";
-     title*2="isn't it!"
-Content-Transfer-Encoding: 7bit
-Message-ID: <15090.61304.110929.45684@aaa.zzz.org>
-From: bbb@ddd.com (John X. Doe)
-To: bbb@zzz.org
-Subject: This is a test message
-Date: Fri, 4 May 2001 14:05:44 -0400
-
-
-Hi,
-
-Do you like this message?
-
--Me
diff --git a/Lib/test/data/msg_30.txt b/Lib/test/data/msg_30.txt
deleted file mode 100644 (file)
index 4334bb6..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From: aperson@dom.ain
-MIME-Version: 1.0
-Content-Type: multipart/digest; boundary=BOUNDARY
-
---BOUNDARY
-
-Content-Type: text/plain; charset=us-ascii
-To: aa@bb.org
-From: cc@dd.org
-Subject: ee
-
-message 1
-
---BOUNDARY
-
-Content-Type: text/plain; charset=us-ascii
-To: aa@bb.org
-From: cc@dd.org
-Subject: ee
-
-message 2
-
---BOUNDARY--
index 9c20c54030f32f7d5db8ef549194d213cf4631b0..4d71e219a4299400d1d09e8ae5dfd6ce49a7ce5a 100755 (executable)
@@ -64,8 +64,7 @@ import traceback
 import random
 import StringIO
 
-import test_support
-
+from test import test_support
 
 RESOURCE_NAMES = ('curses', 'largefile', 'network')
 
index 9deba0d85a36d7ef20b068fdb5580094fe17d0f0..d8dc8b8000c7250dfa561a29474818787df8bc27 100644 (file)
@@ -4,7 +4,7 @@ import unittest
 import StringIO
 import cStringIO
 import types
-import test_support
+from test import test_support
 
 
 class TestGenericStringIO(unittest.TestCase):
index fa8224f7b02b2e1dd36f74c38f39a8d8b36ede56..7507aed89d1ed4b752f2b440a27041bda495712c 100644 (file)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-from test_support import verbose, verify
+from test.test_support import verbose, verify
 from types import TupleType, StringType, IntType
 import __future__
 
index 874e3b7dbcf8ea4bdda7098f913553d3014bdf05..54d278393e32e7abb50791a5db336d079d86f92e 100644 (file)
@@ -4,11 +4,11 @@
 """
 
 import os
-import test_support
 import unittest
 import anydbm
 import tempfile
 import glob
+from test import test_support
 
 _fname = tempfile.mktemp()
 
index 9a298875a186775be58cdd3ef685dce3e44fc11c..023af9ae1604b6668a06a4b1efd942914ee0f98e 100755 (executable)
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import array
-from test_support import verbose, TESTFN, unlink, TestFailed,\
+from test.test_support import verbose, TESTFN, unlink, TestFailed,\
      have_unicode, vereq
 
 def main():
index a4e191497b57649d47f8ac6fe28a22c12c0e42da..440adabd57f4708f2d6b951845a54af878aa4a16 100644 (file)
@@ -1,6 +1,6 @@
 # Test audioop.
 import audioop
-from test_support import verbose
+from test.test_support import verbose
 
 def gendata1():
     return '\0\1\2'
index 02cbd49c2356bfcc1d7cd4ad7618b6e7d6b984de..223c38845f19ad69892dd0dbde3aa330d5177101 100644 (file)
@@ -1,5 +1,5 @@
 import unittest
-import test_support
+from test import test_support
 import base64
 from binascii import Error as binascii_error
 
index 2580fb21e28372ed54b5699b15f66d50e19d8897..2de35ce301d2091657645e6a184a78e4c9b37dc2 100755 (executable)
@@ -7,8 +7,8 @@
 import binhex
 import os
 import tempfile
-import test_support
 import unittest
+from test import test_support
 
 
 class BinHexTestCase(unittest.TestCase):
index 976e7ffa106602e9e750456e055ea1de3a30c8b1..1a4228928b1d3bd00005cc2cd1f78dc5705f8ec8 100644 (file)
@@ -1,7 +1,7 @@
 """Tests for binary operators on subtypes of built-in types."""
 
-import test_support
 import unittest
+from test import test_support
 
 def gcd(a, b):
     """Greatest common divisor using Euclid's algorithm."""
index cadf23a10c767161d741a686373c9dee71de8ea3..404b4e85ebe31eba41af529fdc843cf84108690a 100644 (file)
@@ -1,6 +1,6 @@
 # Test properties of bool promised by PEP 285
 
-from test_support import verbose, TestFailed, TESTFN, vereq, have_unicode
+from test.test_support import verbose, TestFailed, TESTFN, vereq, have_unicode
 import os
 
 def veris(a, b):
index 2059eaf3558d555cda4ae83e473c337848851103..c0b746b86ddfefd2d8080c4b8297900e32ab8783 100644 (file)
@@ -1,7 +1,7 @@
 import calendar
 import unittest
 
-from test_support import run_unittest
+from test.test_support import run_unittest
 
 
 class CalendarTestCase(unittest.TestCase):
index 886bf18c2ba3f440b4cafbef457a24da63fc824c..695ab56f1492a6b7803a99cd94c93c8ecadd06f3 100644 (file)
@@ -1,5 +1,5 @@
 import unittest
-from test_support import run_unittest
+from test.test_support import run_unittest
 
 # The test cases here cover several paths through the function calling
 # code.  They depend on the METH_XXX flag that is used to define a C
index d01d3bf70cd8e53b209697c5ce67db7672be771f..fc31760c2d0e9f2c1a6a5ee047bfc143234a6c09 100644 (file)
@@ -2,7 +2,7 @@
 # these are all functions _testcapi exports whose name begins with 'test_'.
 
 import sys
-import test_support
+from test import test_support
 import _testcapi
 
 for name in dir(_testcapi):
index 509c739ea0dd119beca8eedd0363d14f23408b80..c4096993b6c7d5c26487fd06130c8b1618de3f4f 100755 (executable)
@@ -3,7 +3,7 @@
     Roger E. Masse
 """
 import cmath
-from test_support import verbose
+from test.test_support import verbose
 
 testdict = {'acos' : 1.0,
             'acosh' : 1.0,
index 28d84ce4a63c7e5a233fa8f7735727bf434e93aa..0362d2624ff7859b0f51ab21e534bcf29fd2c970 100644 (file)
@@ -1,4 +1,5 @@
-import test_support,unittest
+from test import test_support
+import unittest
 import codecs
 import StringIO
 
index fbe4a318533d0081730d759a374fb26b3e35eb87..a0ce0bcb7aa5e05824b685afed2d5ecf5604ee57 100644 (file)
@@ -3,7 +3,7 @@
    Nick Mathewson
 """
 import unittest
-from test_support import run_unittest
+from test.test_support import run_unittest
 
 from codeop import compile_command
 
index cf87fd457aae24d28c7ea9284d0c02bf6b9c2ce8..5ea08bc8b4d97192cf5fa20fd0412839eeaaf581 100644 (file)
@@ -5,7 +5,7 @@
 import unittest
 import os, tempfile, re
 
-from test_support import TestSkipped, run_unittest
+from test.test_support import TestSkipped, run_unittest
 from commands import *
 
 # The module says:
index c0638554310f281187b3cf59e0253ec1c1c7f8d7..c9a139b5f5e05f5dc64a2f6d2eb179f4e6118577 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, TestFailed
+from test.test_support import verbose, TestFailed
 
 if verbose:
     print "Testing whether compiler catches assignment to __debug__"
index 7d452f5e0c29b9e8f405dbae7fae3021a5703117..35befb209a0e63378ad98882c39f2fde11c0e968 100644 (file)
@@ -1,6 +1,6 @@
 # Simple test suite for Cookie.py
 
-from test_support import verify, verbose, run_doctest
+from test.test_support import verify, verbose, run_doctest
 import Cookie
 
 # Currently this only tests SimpleCookie
index 0f5c96f10dfd5bddd16510544ca6e707b31b1e99..08c7031920c6feac3c2f1caf171909a7cb1eecd3 100644 (file)
@@ -1,6 +1,6 @@
 import copy_reg
-import test_support
 import unittest
+from test import test_support
 
 
 class C:
index 874735bfceb9ab1ab267ee671bc5b9bc90672ae4..0c34cda743ca8d49d1f909b911d554eb8763f699 100644 (file)
@@ -1,8 +1,8 @@
 import cPickle
-import test_support
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
+from test import test_support
 
 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
 
index ca53ec5ee4a3d08c63ffcf33a737cc558055f8b4..dfbcbdf2283dd886c155358a6e966f80c77af25a 100755 (executable)
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 import crypt
 
 c = crypt.crypt('mypassword', 'ab')
index 8020de1d424999b7b6505b16c2836c139713bb48..f32dbf3e91b538f39796433dd304e6475d9fd7b2 100644 (file)
@@ -14,7 +14,7 @@ import curses, sys, tempfile
 # 'curses' resource be given on the regrtest command line using the -u
 # option.  If not available, nothing after this line will be executed.
 
-import test_support
+from test import test_support
 test_support.requires('curses')
 
 def window_funcs(stdscr):
index b74194a615c509c1e805e405cdd475fa72e7283d..3c6ddd62eb1a1d2b6b52e91237f56bb8e8c41de3 100755 (executable)
@@ -4,7 +4,7 @@
 """
 import dbm
 from dbm import error
-from test_support import verbose, verify
+from test.test_support import verbose, verify
 
 filename = '/tmp/delete_me'
 
index 2227eb8200ca9e9869c4f9a6a1e954ba48365ca4..1dfc5abe87b2f609f529252ae42fa54a7198b819 100644 (file)
@@ -1,6 +1,6 @@
 # Test enhancements related to descriptors and new-style classes
 
-from test_support import verify, vereq, verbose, TestFailed, TESTFN
+from test.test_support import verify, vereq, verbose, TestFailed, TESTFN
 from copy import deepcopy
 import warnings
 
index 32ca73d59cfec2097829ddb678309eb9b76996d4..017c1450aa7b9a4bf831f826bb5a9a6a68c61c1c 100644 (file)
@@ -8,7 +8,7 @@
 # of much interest anymore), and a few were fiddled to make the output
 # deterministic.
 
-from test_support import sortdict
+from test.test_support import sortdict
 import pprint
 
 class defaultdict(dict):
@@ -494,8 +494,8 @@ def test_main(verbose=None):
     # into the doctest examples, and unless the full test.test_descrtut
     # business is used the name can change depending on how the test is
     # invoked.
-    import test_support, test.test_descrtut
-    test_support.run_doctest(test.test_descrtut, verbose)
+    from test import test_support, test_descrtut
+    test_support.run_doctest(test_descrtut, verbose)
 
 # This part isn't needed for regrtest, but for running the test directly.
 if __name__ == "__main__":
index 9c63d9ad1d4b4e9ca65ba8908de085e167619ff5..5687e32770d1049143e42c96c1eec5b403e0478e 100644 (file)
@@ -1,2 +1,3 @@
-import difflib, test_support
+import difflib
+from test import test_support
 test_support.run_doctest(difflib)
index 95dc2af43786dffe14e37336d2ca5d8fe2d85b33..2ec89a2dadf04739c298cc9a47fda7a7e6a40f5b 100644 (file)
@@ -4,7 +4,7 @@
 """
 
 import unittest
-from test_support import run_unittest, TESTFN
+from test.test_support import run_unittest, TESTFN
 import dircache, os, time, sys
 
 
index 390dbd8afa7b90228e4df5d3af3d3868e1489a6f..d1f73b2e04ced9dad9722d9acd319f58ad411169 100755 (executable)
@@ -4,7 +4,7 @@
 """
 
 import dl
-from test_support import verbose,TestSkipped
+from test.test_support import verbose,TestSkipped
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),
index f8ad6fdb6e11523c074bf7672411e09259bb68e7..fd3426c91e89953b3be3e95b9f094a975a5d2671 100644 (file)
@@ -1,2 +1,3 @@
-import doctest, test_support
+import doctest
+from test import test_support
 test_support.run_doctest(doctest)
index 00b6cc44828c0bd32edd230705581565765a3fb2..31bf6e854c1b03ddd865f7ec8226ca1574317ad3 100644 (file)
@@ -5,7 +5,7 @@ like static and class methods.
 yup
 """
 
-import test_support
+from test import test_support
 
 class C(object):
     """Class C.
index 3cca1597ebd7b3b74797bf78535a6aab4f810f5b..6bc1a5b6ae8fd4624616b23762f924ad82acb4d9 100644 (file)
@@ -1,6 +1,6 @@
 import dospath
-import test_support
 import unittest
+from test import test_support
 
 
 class DOSPathTestCase(unittest.TestCase):
index f3675a537d88288023f5b38b0f4b584efb0c68c3..7417f12eb68c9d42f2597429627f33275e2ad2fd 100644 (file)
@@ -4,10 +4,10 @@
 """
 
 import os
-import test_support
 import unittest
 import dumbdbm
 import tempfile
+from test import test_support
 
 _fname = tempfile.mktemp()
 
index e1683fdfcaa9abea0d01c6b0b9d7454dd24aa36e..1fa94799b79acc234010c710b3c122dda167c39a 100644 (file)
@@ -1,6 +1,6 @@
 import unittest
 
-import test_support
+from test import test_support
 
 seq, res = 'abc', [(0,'a'), (1,'b'), (2,'c')]
 
index cb1e729f8ec0aa36245df0d8c1106c4a581ea507..78693281eba0a8afb4779bb7736a188e78000569 100755 (executable)
@@ -4,7 +4,7 @@
 """
 
 import errno
-from test_support import verbose
+from test.test_support import verbose
 
 errors = ['E2BIG', 'EACCES', 'EADDRINUSE', 'EADDRNOTAVAIL', 'EADV',
           'EAFNOSUPPORT', 'EAGAIN', 'EALREADY', 'EBADE', 'EBADF',
index cc4f2134b312dfcf62f05ade5ee0154b635940bd..530ca0c0dfa316bbdf37daaadb9d3c01aadb6e85 100755 (executable)
@@ -6,7 +6,7 @@
 import struct
 import fcntl
 import os, sys
-from test_support import verbose, TESTFN
+from test.test_support import verbose, TESTFN
 
 filename = TESTFN
 
index fe908605e83ef22ae7f912cd192da5676395ae66..3a82c7c71f3ffe3b27e8729a9164d7032e03384f 100644 (file)
@@ -3,7 +3,7 @@ Tests for fileinput module.
 Nick Mathewson
 '''
 
-from test_support import verify, verbose, TESTFN
+from test.test_support import verify, verbose, TESTFN
 import sys, os, re
 from StringIO import StringIO
 from fileinput import FileInput
index 0bd7d6a96cd442de9065d15ab2bffb88591a2cc6..9abcbd6f28607b596cc34b3d772d1067c0f36b93 100644 (file)
@@ -1,6 +1,6 @@
 """Test cases for the fnmatch module."""
 
-import test_support
+from test import test_support
 import unittest
 
 from fnmatch import fnmatch, fnmatchcase
index 127a407dcc9acdc4ceebec47cde9d7caafbd3e5a..def8e656e1d461a1344911469414ddae03b4be1d 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, have_unicode
+from test.test_support import verbose, have_unicode
 import sys
 
 # test string formatting operator (I am not sure if this is being tested
index d4a5eb25ab1ff919fd1dae3e9b10b2eb9499f61f..a1b872262a6609b17be909a822b38e3299459b45 100644 (file)
@@ -2,7 +2,7 @@
    Tests for fpformat module
    Nick Mathewson
 '''
-from test_support import run_unittest
+from test.test_support import run_unittest
 import unittest
 from fpformat import fix, sci, NotANumber
 
index 764584c10a0888674b0ae7e832c1dbe6a1855fa1..62bc8573fc5ffd71dd18b16fec5a871c9871eef6 100644 (file)
@@ -1,6 +1,6 @@
 # Test various flavors of legal and illegal future statements
 
-from test_support import unload
+from test.test_support import unload
 import re
 
 rx = re.compile('\((\S+).py, line (\d+)')
index 977f7b00e2ed33764596f3807b4ebefd305a59e5..40edd30b752eeff13b2c7bbaaaf867772b714b0f 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed
+from test.test_support import verify, verbose, TestFailed
 import sys
 import gc
 
index d3640160c4f70d093024737e72f39dcb7e84e65c..03a47d9c245e883ed8a4a2d4b10abd834557364b 100755 (executable)
@@ -5,7 +5,7 @@
 
 import gdbm
 from gdbm import error
-from test_support import verbose, verify, TestFailed
+from test.test_support import verbose, verify, TestFailed
 
 filename= '/tmp/delete_me'
 
index 55a6a9888807e3d4312a1ac9c00028998e30808c..170d92ec726c66a3c6758265a29a23ef3eb179dd 100644 (file)
@@ -483,6 +483,7 @@ A->A B->G C->A D->G E->G F->A G->G H->G I->A J->G K->A L->A M->G
 merged A into G
 A->G B->G C->G D->G E->G F->G G->G H->G I->G J->G K->G L->G M->G
 """
+# Emacs turd '
 
 # Fun tests (for sufficiently warped notions of "fun").
 
@@ -1370,7 +1371,8 @@ __test__ = {"tut":      tutorial_tests,
 # Note that doctest and regrtest both look in sys.argv for a "-v" argument,
 # so this works as expected in both ways of running regrtest.
 def test_main(verbose=None):
-    import doctest, test_support, test_generators
+    import doctest
+    from test import test_support, test_generators
     if 0:   # change to 1 to run forever (to check for leaks)
         while 1:
             doctest.master = None
index e2ae9fed418f55cc81915b5ccfae8d891875a1f4..70ea65b4b0d62c60a3bb9746168b19da24881fbd 100644 (file)
@@ -3,7 +3,7 @@
 
 import getopt
 from getopt import GetoptError
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 import os
 
 def expectException(teststr, expected, failure=AssertionError):
index 8cf6ecf47120d22b0b1a9c3c37c98798656682e0..cfc30771e7f4851023f63a9a6916b81137646761 100644 (file)
@@ -1,5 +1,5 @@
 import unittest
-from test_support import run_unittest, TESTFN
+from test.test_support import run_unittest, TESTFN
 import glob
 import os
 
index a16a922956afeabf3eeeb40721ed89d9e8d04e99..a8d78ba274cf60abb0ffc3be2bed38f032c9ffac 100755 (executable)
@@ -3,8 +3,8 @@
 # XXX This really needs some work, but what are the expected invariants?
 
 import grp
-import test_support
 import unittest
+from test import test_support
 
 
 class GroupDatabaseTestCase(unittest.TestCase):
index f8a1523cc689c65b6689215e0d9625849d6d0ddd..90e80fc94dee58bf19e8bf00988817814dbbfff6 100644 (file)
@@ -2,8 +2,8 @@
 #   iff a==b then hash(a)==hash(b)
 #
 
-import test_support
 import unittest
+from test import test_support
 
 
 class HashEqualityTestCase(unittest.TestCase):
index b7b3c079244b55b10397eadc40ee38c2b9342b1d..f9cd73e64208a44b28d77f437bf425c3f3922098 100644 (file)
@@ -1,6 +1,6 @@
 import hmac
 import unittest
-import test_support
+from test import test_support
 
 class TestVectorsTestCase(unittest.TestCase):
     def test_vectors(self):
index 2a45a7f527c80396864ebe0db6fe31590cea3274..c4d24849311ad8644292033428018f8ed396e081 100644 (file)
@@ -4,7 +4,7 @@ import os
 import pprint
 import unittest
 
-import test_support
+from test import test_support
 
 from hotshot.log import ENTER, EXIT, LINE
 
index 620853d3ba55a652b87bbedb88895c5fe56bca6f..e283d1118fea2ed6f47b0db329b4413844a50207 100644 (file)
@@ -2,7 +2,7 @@ import formatter
 import htmllib
 import unittest
 
-import test_support
+from test import test_support
 
 
 class AnchorCollector(htmllib.HTMLParser):
index 9d60dd8aefebb5773dbea86dc7993c8fb5a4e58f..8422751cef0949fe75f194cea74317c07ee68b52 100755 (executable)
@@ -3,8 +3,8 @@
 import HTMLParser
 import pprint
 import sys
-import test_support
 import unittest
+from test import test_support
 
 
 class EventCollector(HTMLParser.HTMLParser):
index ff83c45e53c45706970abd08e6a29da1429e3986..7b32bbc36ce865e8f60631ecab4ca311fcd1d268 100755 (executable)
@@ -5,7 +5,7 @@
    Roger E. Masse
 """
 
-from test_support import verbose, unlink
+from test.test_support import verbose, unlink
 
 import imageop, uu, os
 
index e99b75873f300f66486d64b22b6d90fea84178b7..bdfd796b1e028904dce9266e7e54515a67090b4c 100755 (executable)
@@ -4,7 +4,7 @@
    Roger E. Masse
 """
 
-from test_support import verbose, unlink, findfile
+from test.test_support import verbose, unlink, findfile
 
 import imgfile, uu, os
 
index 1ddd13e6b2ea191c5267902cbccede6f848db71b..f946445bd9f95593ecdde2389127ff8c032c3b07 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import TESTFN, TestFailed
+from test.test_support import TESTFN, TestFailed
 
 import os
 import random
index 58b757084a2348ac331bf267822805d726407e87..ccfba34ea680eec688655a42deabb39353015ac7 100644 (file)
@@ -62,7 +62,7 @@ class FesteringGob(MalodorousPervert, ParrotDroppings):
 # getsourcefile, getcomments, getsource, getclasstree, getargspec,
 # getargvalues, formatargspec, formatargvalues, currentframe, stack, trace
 
-from test_support import TestFailed, TESTFN
+from test.test_support import TestFailed, TESTFN
 import sys, imp, os, string
 
 def test(assertion, message, *args):
index ebdcbb4b076bffb5fb276413fede8d69d70a9efd..8dfb9566534ef3f2a109e37b771f467b2faaa822 100644 (file)
@@ -3,7 +3,7 @@
 # testing of error conditions uncovered when using extension types.
 
 import unittest
-import test_support
+from test import test_support
 
 
 \f
index 0085db5dc129ea307b10929e3d142426199c961b..509ec01b279f3b7a162b5e4a12e231c88695be37 100644 (file)
@@ -1,7 +1,7 @@
 # Test iterators.
 
 import unittest
-from test_support import run_unittest, TESTFN, unlink, have_unicode
+from test.test_support import run_unittest, TESTFN, unlink, have_unicode
 
 # Test result of triple loop (too big to inline)
 TRIPLETS = [(0, 0, 0), (0, 0, 1), (0, 0, 2),
index 8bff5df45ed72c95d53c454aaeaafa29e1690bb4..7287e6dd72f33b652c4652d9124d0b0988c1c134 100644 (file)
@@ -5,7 +5,7 @@
 #
 #----------------------------------------------------------------------
 
-import test_support
+from test import test_support
 import os, struct, stat, sys
 
 try:
index cc44d8b50808e5cb1fc3caa297e3c339b3dea0da..9f44629dfc40d518a5fb9390e0f44c25fb5e3b36 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, findfile, TestFailed, TestSkipped
+from test.test_support import verbose, findfile, TestFailed, TestSkipped
 
 import errno
 import fcntl
index 0040a20899af109902356871f73118bb917fed0b..2e056cfe103f862052dc50df2d56b3a1bbfbc8bc 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose
+from test.test_support import verbose
 import locale
 import sys
 
index 5e98225c3a08831a0cf44f1887df251657fa5594..78224128aa99de08b03c1db212ac8e457906584c 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed, fcmp
+from test.test_support import verify, verbose, TestFailed, fcmp
 from string import join
 from random import random, randint
 
index cb0ac58b08e3119930c90e6b2a5bcecba8a423d6..074c1489f9f193a96fcc8d3b1657dd7848eeac4b 100644 (file)
@@ -3,7 +3,7 @@ from __future__ import division
 # test_long.py instead.  In the meantime, it's too obscure to try to
 # trick just part of test_long into using future division.
 
-from test_support import TestFailed, verify, verbose
+from test.test_support import TestFailed, verify, verbose
 
 def test_true_division():
     if verbose:
index bb75e64df9f08d928ea095670f18c152eccbb16c..dc89fd8a712642c4d4794554e3f157d0aa9be064 100644 (file)
@@ -1,8 +1,8 @@
 import mailbox
 import os
-import test_support
 import time
 import unittest
+from test import test_support
 
 # cleanup earlier tests
 try:
index 38b3cd4698c6bdf81f701f68d801ae54533ebda6..53772246eb8177981e9089bd7038670725fd0a29 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import TestFailed
+from test.test_support import TestFailed
 import marshal
 import sys
 
index d64024f41f67d58d8b0004efd03f6686ccdd49ee..51013815ffc3db339d860f8b75b22b797b473463 100644 (file)
@@ -1,7 +1,7 @@
 # Python test set -- math module
 # XXXX Should not do tests around zero only
 
-from test_support import *
+from test.test_support import *
 
 seps='1e-05'
 eps = eval(seps)
index ef5877de035cb2063910e6797aaf3ecb2bdc37b5..862d301cb710b4b95b3cecefaddfcea0b1e12f46 100644 (file)
@@ -7,7 +7,7 @@
 ###      mhlib.  It should.
 
 import unittest
-from test_support import run_unittest, TESTFN, TestSkipped
+from test.test_support import run_unittest, TESTFN, TestSkipped
 import os, StringIO
 import sys
 import mhlib
index 0300714d76f84a4fcf3e98b46077ceafeccf2e0a..79464a2eaf20a35cd05e15a9bb67c5b05d2153a2 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import TestFailed
+from test.test_support import TestFailed
 import mimetools
 
 import string,StringIO
index d0a32a9ffaf2bda464bd2538b79a988ce202b126..69539663ca6fa3e1717119d3fdf596cf9d0d61d0 100644 (file)
@@ -2,7 +2,7 @@ import mimetypes
 import StringIO
 import unittest
 
-import test_support
+from test import test_support
 
 # Tell it we don't know about external files:
 mimetypes.knownfiles = []
index ac5b04c130cc5ba1bc036c3cb964de18c5a472c2..4d7a1af081e67edd708f5154f9e854daf388e9ea 100644 (file)
@@ -4,7 +4,7 @@ import os
 import sys
 import traceback
 
-from test_support import verbose
+from test.test_support import verbose
 
 import xml.dom
 import xml.parsers.expat
index 4fb4ec10c504503c895fe85f39e9e0be61404369..11edbaf797fe354ec91c65bc97fb9cabe2ee1ade 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify, vereq, TESTFN
+from test.test_support import verify, vereq, TESTFN
 import mmap
 import os, re
 
index f3bf3d877513590f7804462ac9ed0eb24275ee94..2b35a531afd5e7baae7d95fcec05f9824b69876a 100644 (file)
@@ -1,6 +1,6 @@
 # Test the module type
 
-from test_support import verify, vereq, verbose, TestFailed
+from test.test_support import verify, vereq, verbose, TestFailed
 
 import sys
 module = type(sys)
index 804dc6bc3dd789f13b55cf4137efb8bb36638d93..dc583ae7f46874b1c15efd912115512ca8130281 100644 (file)
@@ -1,6 +1,6 @@
 
 import mpz
-from test_support import vereq, TestFailed
+from test.test_support import vereq, TestFailed
 
 def check_conversion(num):
     mpz_num = mpz.mpz(num)
index 9ee1bb7537db090f419efb941c25ef70fdda7a09..60a17aa8e53e67875f30277d589f4c24d4b83b7e 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, TESTFN
+from test.test_support import verbose, TESTFN
 import random
 import os
 
index 2cf1ae4dcec910a9fad671a2a300d9e0115f52d6..034b10550f4306fdc961ff023b27cb0d1e131c20 100644 (file)
@@ -1,5 +1,6 @@
 
-import netrc, os, tempfile, test_support, unittest
+import netrc, os, tempfile, unittest
+from test import test_support
 
 TEST_NETRC = """
 machine foo login log1 password pass1 account acct1
index eb762f7dec4ae19440a6cdb0ff57702079c2f732..c56f13fc42306b23ac73b8413f47b37a4214b128 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, verify
+from test.test_support import verbose, verify
 import sys
 import new
 
index e1670d16e544531c2f8eda197b7ceb1423297cc8..f5224fec3a4624b1875be1546246ec38061f3aac 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, TestFailed, TestSkipped
+from test.test_support import verbose, TestFailed, TestSkipped
 import nis
 
 print 'nis.maps()'
index 4dee1fc00ccbd3fb9e7ac65d8108aa39a2a2384f..40d785f04ec54b5433e0e312f2b6ab69078baf9a 100644 (file)
@@ -1,5 +1,5 @@
 import ntpath
-from test_support import verbose, TestFailed
+from test.test_support import verbose, TestFailed
 import os
 
 errors = 0
index 31569d5fcbb97ada172897da5f9bd950ddd0ee07..515df6c1d4fc0f9a95165c8f86db2f03641bee0e 100644 (file)
@@ -1,6 +1,6 @@
 # Python test set -- part 2, opcodes
 
-from test_support import *
+from test.test_support import *
 
 
 print '2. Opcodes'
index fb817193d5109501799e74ef0c8ed58843be76aa..858c9ea4db2c0e1289ab50b778f7119054e28540 100644 (file)
@@ -1,7 +1,7 @@
 # Test to see if openpty works. (But don't worry if it isn't available.)
 
 import os
-from test_support import verbose, TestFailed, TestSkipped
+from test.test_support import verbose, TestFailed, TestSkipped
 
 try:
     if verbose:
index 439d340ce3c86ffbb4e826901c0927202fa7a086..f1e295954562d1235ecf9a846de53ad2be04181a 100644 (file)
@@ -1,7 +1,7 @@
 import operator
 import unittest
 
-import test_support
+from test import test_support
 
 
 class OperatorTestCase(unittest.TestCase):
index 735d4cb253aebdbc660424bd95b36f5e98961442..347c4458f9df4263f21f16c8d6a1cd8080ce44ba 100644 (file)
@@ -9,7 +9,7 @@ import warnings
 warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
 warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
 
-from test_support import TESTFN, run_unittest
+from test.test_support import TESTFN, run_unittest
 
 class TemporaryFileTests(unittest.TestCase):
     def setUp(self):
index 5df1e4613140122a8ed7446d215ff30b7a56ea5d..a28875e004f530b9a4453c2473037e4438f3186f 100644 (file)
@@ -1,6 +1,6 @@
 import parser
-import test_support
 import unittest
+from test import test_support
 
 #
 #  First, we test that we can generate trees from valid source fragments,
index 6265676533bba04aa1793196ef9d914d199c79e2..935a7632620d32e1b491cd130aac7149fdf1d963 100644 (file)
@@ -1,8 +1,8 @@
 import pickle
-import test_support
 import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
+from test import test_support
 
 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
 
index c9e771dc086d891bee73d062f01eee01286c3bb4..224cefade57f528c144fde5eac43da65282f2849 100644 (file)
@@ -3,7 +3,7 @@
 import sys, os, tempfile, traceback
 from os import mkdir, rmdir, extsep          # Can't test if these fail
 del mkdir, rmdir
-from test_support import verify, verbose, TestFailed
+from test.test_support import verify, verbose, TestFailed
 
 # Helpers to create and destroy hierarchies.
 
index 8c7a99be827094588df287f0edae1722ed129584..523ba5a235399a24482c2b3335f13b3acfe15637 100644 (file)
@@ -1,6 +1,6 @@
 import os, sys, string, random, tempfile, unittest
 
-from test_support import run_unittest
+from test.test_support import run_unittest
 
 class TestImport(unittest.TestCase):
 
index f6d427ccd5fa4c4913f9de68cabb0bdfa16b6d7c..ed1d73679364daed73fc4216a48b11af1f7eaab4 100644 (file)
@@ -1,7 +1,7 @@
 # Test case for the os.poll() function
 
 import sys, os, select, random
-from test_support import verify, verbose, TestSkipped, TESTFN
+from test.test_support import verify, verbose, TestSkipped, TESTFN
 
 try:
     select.poll
index 17491d84107cfaff0b111f91aea4b1877a4da129..9111ec5e494d38631d2457a6695ddcd6e148d64d 100644 (file)
@@ -6,7 +6,7 @@
 
 import os
 import sys
-from test_support import TestSkipped
+from test.test_support import TestSkipped
 from os import popen
 
 # Test that command-lines get down as we expect.
index c67dd712d9a882bc3329b5ba8c6437ad7f8bdc8e..cf3a09465a499628e46b1724bbf2d4025abd9169 100644 (file)
@@ -5,7 +5,7 @@
 
 import os
 import sys
-from test_support import TestSkipped
+from test.test_support import TestSkipped
 
 # popen2 contains its own testing routine
 # which is especially useful to see if open files
index 7a38f678d2c9b77ef40eac77ce97fe1cfeb94e18..2b3465c7f96b316e6a8d0ae9ed17b28df4bc3897 100644 (file)
@@ -1,5 +1,5 @@
 import sys
-import test_support
+from test import test_support
 
 
 def powtest(type):
index d5e10aa458b9875c8109120cc1fcf6216c26259c..293b75f150a20f18e3fa8d9255d1fb1739f4d508 100644 (file)
@@ -1,7 +1,6 @@
 import pprint
 import unittest
-
-import test_support
+from test import test_support
 
 try:
     uni = unicode
index 8990e2ced2e37925ab4d8d3e142ea697fb2c0693..75599d907b04f7fbf93a7acff6af209bbcf02e5f 100644 (file)
@@ -1,10 +1,8 @@
-from test_support import TestFailed
-
 import pprint
 import sys
 import unittest
 
-import test_support
+from test import test_support
 
 
 class HookWatcher:
@@ -329,9 +327,13 @@ protect_ident = ident(protect)
 
 
 def capture_events(callable, p=None):
-    try: sys.setprofile()
-    except TypeError: pass
-    else: raise TestFailed, 'sys.setprofile() did not raise TypeError'
+    try:
+        sys.setprofile()
+    except TypeError:
+        pass
+    else:
+        raise test_support.TestFailed(
+            'sys.setprofile() did not raise TypeError')
 
     if p is None:
         p = HookWatcher()
index 204ff56922a69bdb8b3fa7b71102b4daf3e9e495..eb833f0443e2b98effd6a9408fa3b9a8459c1197 100644 (file)
@@ -1,5 +1,5 @@
 import pty, os, sys
-from test_support import verbose, TestFailed, TestSkipped
+from test.test_support import verbose, TestFailed, TestSkipped
 
 TEST_STRING_1 = "I wish to buy a fish license.\n"
 TEST_STRING_2 = "For my pet fish, Eric.\n"
index 2cb122beeea6c458900cc03387452390f780fab9..75d083bc9d0856da2bd71d8eb0cc1e157450a697 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose
+from test.test_support import verbose
 import pwd
 
 print 'pwd.getpwall()'
index ae3a5bd769ff8dc2ca34838d329fff446147dc61..61d59f77b4d4354e149e1b6c0735e444c20ea0da 100644 (file)
@@ -2,7 +2,7 @@
    Test cases for pyclbr.py
    Nick Mathewson
 '''
-from test_support import run_unittest
+from test.test_support import run_unittest
 import unittest, sys
 from types import ClassType, FunctionType, MethodType
 import pyclbr
index 2415ff0b8148f2c34d2cc72430bc63040dc3f76a..09314c37ce3ae1b7dbdac3dc3413d7bcc12722a0 100644 (file)
@@ -6,7 +6,7 @@
 import pyexpat
 from xml.parsers import expat
 
-from test_support import sortdict, TestFailed
+from test.test_support import sortdict, TestFailed
 
 class Outputter:
     def StartElementHandler(self, name, attrs):
index c0b94d5926610a22f8663118f36791dca1d2e151..a2c744fe59f0c77435e31dc7d7232a7b326890af 100644 (file)
@@ -5,7 +5,7 @@ import sys
 import threading
 import time
 
-from test_support import verify, TestFailed, verbose
+from test.test_support import verify, TestFailed, verbose
 
 queue_size = 5
 
index 2497705a2d8bfa3361bda9f79cd50a4b1bc5c6cc..dedda8d8ddaa3287f159fbeeab4a9bd919df049b 100644 (file)
@@ -1,4 +1,4 @@
-import test_support
+from test import test_support
 import unittest
 
 from cStringIO import StringIO
index d508c9fa656916cef77862c41e1d4b9736e748f8..5f60f4b7b23521ef3ec08fbb618dc86fb0957740 100644 (file)
@@ -1,4 +1,4 @@
-import test_support
+from test import test_support
 import random
 
 # Ensure that the seed() method initializes all the hidden state.  In
index 45bb3b14ec7c0c7189451f36deda3ab788545950..5475416924ef8cad47c38a9e73aff2caf4211701 100644 (file)
@@ -1,7 +1,7 @@
 import sys
 sys.path = ['.'] + sys.path
 
-from test_support import verify, verbose, TestFailed
+from test.test_support import verify, verbose, TestFailed
 import re
 import sys, os, traceback
 
index 0fe82b7f1de410611faaa10a09bb16f19cb4ab56..dbc6ec3041867b292daa8d66cb5682b35f4a1db3 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, sortdict
+from test.test_support import verbose, sortdict
 import warnings
 warnings.filterwarnings("ignore", "the regex module is deprecated",
                         DeprecationWarning, r'test_regex$')
index f8aad94f95ccecd7817c50f5d89d9c9f2e2894a5..14cf181eed67979bd99415ef541581b5cdd520c5 100644 (file)
@@ -7,7 +7,7 @@ import sys
 import os
 import unittest
 
-from test_support import run_unittest
+from test.test_support import run_unittest
 from repr import repr as r # Don't shadow builtin repr
 
 
index 1293833e307fbb9873af7af2266325bd0b524f72..12b8134a6abce649dba97172b373df6427f6f2c8 100644 (file)
@@ -1,7 +1,7 @@
 import os
 import resource
 
-from test_support import TESTFN
+from test.test_support import TESTFN
 
 # This test is checking a few specific problem spots.  RLIMIT_FSIZE
 # should be RLIM_INFINITY, which will be a really big number on a
index 756c5c759c417e2ce01ff975b26239ace68802c0..0bdd99afb37c0b8e210e926473ef7def9f76e14d 100644 (file)
@@ -1,7 +1,7 @@
 import rfc822
 import sys
-import test_support
 import unittest
+from test import test_support
 
 try:
     from cStringIO import StringIO
index b632cd074ee5e97da26a406c1ddf5d25dee2899a..010b3b5fd02aa5467c9c9741047ba88eec72604f 100644 (file)
@@ -2,7 +2,7 @@
 
 import rgbimg, os, uu
 
-from test_support import verbose, unlink, findfile
+from test.test_support import verbose, unlink, findfile
 
 class error(Exception):
     pass
index 4e7d45925d220431dac67ae5204c5906751d3fbb..f4c2c7f43e8afb803c5c1a1eb4c37e3f420e5988 100644 (file)
@@ -1,6 +1,6 @@
 # Tests for rich comparisons
 
-from test_support import TestFailed, verify, verbose
+from test.test_support import TestFailed, verify, verbose
 
 class Number:
 
index beec0067894be30fb84a1ea4a27072bedc477d1d..6a23b22db3c0a1d2029db9d8deca5575ed59042b 100644 (file)
@@ -1,4 +1,5 @@
-import unittest, StringIO, robotparser, test_support
+import unittest, StringIO, robotparser
+from test import test_support
 
 class RobotTestCase(unittest.TestCase):
     def __init__(self, index, parser, url, good, agent):
index 32b7609cc651db1bc4f56675f2af2c3d45a2292e..acb765863d5ef0be1c1322ec368635be98dd7901 100644 (file)
@@ -12,7 +12,7 @@ from xml.sax.saxutils import XMLGenerator, escape, quoteattr, XMLFilterBase
 from xml.sax.expatreader import create_parser
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
 from cStringIO import StringIO
-from test_support import verify, verbose, TestFailed, findfile
+from test.test_support import verify, verbose, TestFailed, findfile
 import os
 
 # ===== Utilities
index f39bbc2037203d041c39fad457f769213c6d814a..bf9a658478b20d6c3e5f8891200b37321bee428f 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify, TestFailed, check_syntax
+from test.test_support import verify, TestFailed, check_syntax
 
 import warnings
 warnings.filterwarnings("ignore", r"import \*", SyntaxWarning, "<string>")
index e2c3cfef631e1bc9888539ca11e53148d1955c15..1bc2ba927ab25b429598f322e65fe0cfd00b2270 100644 (file)
@@ -1,5 +1,5 @@
 # Testing select module
-from test_support import verbose
+from test.test_support import verbose
 import select
 import os
 
index ff0af9e323578fa74dd0bc6120c32a0da0729e80..f6f13093535d7e637ad17fd2a47205588cb5bb8d 100644 (file)
@@ -1,7 +1,7 @@
 import pprint
 import sgmllib
-import test_support
 import unittest
+from test import test_support
 
 
 class EventCollector(sgmllib.SGMLParser):
index cad7780467fff7c3d06e14b562bfb0772dded06e..c438cc6417efb5ef20929d1ab830e37f8e9a3319 100644 (file)
@@ -5,8 +5,8 @@
 # http://www.itl.nist.gov/div897/pubs/fip180-1.htm
 
 import sha
-import test_support
 import unittest
+from test import test_support
 
 
 class SHATestCase(unittest.TestCase):
index 951e58ad3eec11fd0a545579049cb8cf1bc2a867..737f1608c9f873a633a708289b994498aeb97d27 100644 (file)
@@ -1,5 +1,5 @@
 # Test the signal module
-from test_support import verbose, TestSkipped, TestFailed
+from test.test_support import verbose, TestSkipped, TestFailed
 import signal
 import os, sys, time
 
index 895238f106404ee2fd8b4a084ae36162a14bf258..a837abe45e4337fc780bf23381d4e0c11881b72a 100644 (file)
@@ -1,6 +1,6 @@
 # tests for slice objects; in particular the indices method.
 
-from test_support import vereq
+from test.test_support import vereq
 
 vereq(slice(None           ).indices(10), (0, 10,  1))
 vereq(slice(None,  None,  2).indices(10), (0, 10,  2))
index cd23f8b5ee9a1931dde839d829532bf8c4ed395a..0b36136330140753f4426944a49664935091f623 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import unittest
-import test_support
+from test import test_support
 
 import socket
 import select
index 2645876328cade70c3562fc97055e445f40c2824..9c0d8cce39962088351de197fc3637d9528526e8 100644 (file)
@@ -1,6 +1,6 @@
 # Test just the SSL support in the socket module, in a moderately bogus way.
 
-import test_support
+from test import test_support
 
 # Optionally test SSL support.  This currently requires the 'network' resource
 # as given on the regrtest command line.  If not available, nothing after this
index 19b5bf58f2db12848d47140b1404d795b5926ab9..29c8c37d22665fd884ebef04fa8c598827ebe027 100644 (file)
@@ -1,7 +1,7 @@
 # Test suite for SocketServer.py
 
-import test_support
-from test_support import verbose, verify, TESTFN, TestSkipped
+from test import test_support
+from test.test_support import verbose, verify, TESTFN, TestSkipped
 test_support.requires('network')
 
 from SocketServer import *
index ba860ebf85a88cd1e9350970a1cf57fb9dd50767..5405ba3fe9f7061f950c1ea9e16961162d8777b6 100644 (file)
@@ -1,4 +1,4 @@
-import test_support
+from test import test_support
 import StringIO
 
 # SF bug 480215:  softspace confused in nested print
index abd55db1d64d8ee344942fa5d314d645cbe27731..4f2aae84b76ab8a2c73fe1539ba43cd1ca78c84c 100644 (file)
@@ -6,7 +6,7 @@
 import sys
 sys.path=['.']+sys.path
 
-from test_support import verbose, TestFailed, have_unicode
+from test.test_support import verbose, TestFailed, have_unicode
 import sre
 import sys, os, string, traceback
 
index 4ce72b98809bdee062115bbc45a1b0473f9977ed..9bd045d8944786527a6be014eace29cf3600891b 100755 (executable)
@@ -3,7 +3,7 @@
 # Sanity checker for time.strftime
 
 import time, calendar, sys, os, re
-from test_support import verbose
+from test.test_support import verbose
 
 def main():
     global verbose
index cc61512a73e355250903b9258794310e09395e30..af8c1bce66d15d9dc09bddbb5c99fcf3568be598 100644 (file)
@@ -1,5 +1,5 @@
-from test_support import verbose, TestSkipped
-import string_tests
+from test.test_support import verbose, TestSkipped
+from test import string_tests
 import string, sys
 
 # XXX: kludge... short circuit if strings don't have methods
index 1e3febab0600f8854931551ad191877df227f30c..4f5ba000d7b59763b1f75d6ac94439c28020f984 100644 (file)
@@ -3,8 +3,8 @@ warnings.filterwarnings("ignore", "strop functions are obsolete;",
                         DeprecationWarning,
                         r'test_strop|unittest')
 import strop
-import test_support
 import unittest
+from test import test_support
 
 
 class StropFunctionTestCase(unittest.TestCase):
index 34abad55ea267cfb485903abef5cce0319a3c074..b9895d458e0b44ebeecf9f6709a7dea932474f40 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import TestFailed, verbose, verify
+from test.test_support import TestFailed, verbose, verify
 import struct
 ## import pdb
 
index c09e0691cd84a0e7dcbdca1aeccb8a83648ccad4..2760d722b4e724830570dc035afb74453979de3a 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import vereq
+from test.test_support import vereq
 
 import time
 
index 4864ec5be24d25c203a29fccc3028eee78df6d83..f203d9a304bf62554e2d39498004d6249dff56db 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, findfile, TestFailed, TestSkipped
+from test.test_support import verbose, findfile, TestFailed, TestSkipped
 import sunaudiodev
 import os
 
index bd33b82c282b18541d95262a9f75e0d44f8a6758..48f5c68e5e12ab92db02b796c1ee38ae67264597 100644 (file)
@@ -8,7 +8,7 @@ warnings.filterwarnings('ignore', r".*statcache module",
 warnings.filterwarnings('ignore', r".*'re' module",
                         DeprecationWarning, 'pre$')
 
-from test_support import verbose
+from test.test_support import verbose
 
 import BaseHTTPServer
 import CGIHTTPServer
index 56d772ea4553af90bafae306ba2d2ca0dabf295f..44f156e8bf8c691f428f6824e4795c994420efe2 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify
+from test.test_support import verify
 
 import _symtable
 
index 6605e27d725bbc7b8341a499185a5bad24cd6b45..c5c4f6376f454cedf94c65a469bf836dbe19230b 100644 (file)
@@ -1,7 +1,7 @@
 import re
 import unittest
 
-import test_support
+from test import test_support
 
 class SyntaxTestCase(unittest.TestCase):
 
index a45fb2fd5b3f9dc3d9260e46393ea6ce1425dfa5..ea345b60a015e3f3a68ef08fcb0b4279ef5bfd3d 100644 (file)
@@ -2,7 +2,7 @@
 
 # Create a bunch of threads, let each do some work, wait until all are done
 
-from test_support import verbose
+from test.test_support import verbose
 import random
 import thread
 import time
index d9f3d705738d6b752be830a615b9b12484fdd9fa..8bdae4249dfed71e8584d17ba9bd719550d5803d 100644 (file)
@@ -6,7 +6,7 @@
 # randrange, and then Python hangs.
 
 import thread
-from test_support import verbose, TestSkipped
+from test.test_support import verbose, TestSkipped
 
 critical_section = thread.allocate_lock()
 done = thread.allocate_lock()
index 9aa93763e374565fe1699ef0a26bd5e176864b5a..2b5ecf2511d7e290395e3bcae292f571333321f7 100644 (file)
@@ -22,7 +22,7 @@ FILES_PER_THREAD = 50   # change w/ -f option
 
 import thread # If this fails, we can't test this module
 import threading
-from test_support import TestFailed
+from test.test_support import TestFailed
 import StringIO
 from traceback import print_exc
 
index 52301177de1efbcd5ba5f31ac41a927ddf0172fa..cbf6202b5bc60fb66bd1a713e3f8baac8ba81a7f 100644 (file)
@@ -2,7 +2,7 @@
 
 # Create a bunch of threads, let each do some work, wait until all are done
 
-from test_support import verbose
+from test.test_support import verbose
 import random
 import threading
 import time
index 7c6b3bac6b92a999ba8661f0b1379416b2eeef2d..460c9892b3195f40549b468814afcfde8b0f00db 100644 (file)
@@ -1,4 +1,4 @@
-import test_support
+from test import test_support
 import time
 import unittest
 
index d79c4ee7d9bcdfabeb87131998ae4ed29f1de2d0..57185a25697d2a5dec4c1b75bc80d37b36dc2fe8 100644 (file)
@@ -1,7 +1,7 @@
 """Unit tests for socket timeout feature."""
 
 import unittest
-import test_support
+from test import test_support
 
 import time
 import socket
index 5dbc895385c682ba83845d04ee703be1a8ce41b1..5797833fc79d0e31ee360647778d7d9d9a65219b 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose
+from test.test_support import verbose
 import timing
 
 r = range(100000)
index 7ac5624e9452101661ca38551ebdecdd3d6cb4e7..e3fbb15f869bec52b961fade38a18b71011448d6 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose, findfile
+from test.test_support import verbose, findfile
 import tokenize, os, sys
 
 if verbose:
index 1b0a1245445a54335fa582592166c4fcd6e85931..44221188f534fa1ce199910005359bf153f22665 100644 (file)
@@ -1,7 +1,7 @@
 """Test cases for traceback module"""
 
 import unittest
-from test_support import run_unittest
+from test.test_support import run_unittest
 
 import traceback
 
index 87a70fb18dc9d1f012ff5c1edae7325d4dae7d07..7efca216fe6c3bf781c8ae9e8a02a2fbd224fab7 100644 (file)
@@ -1,6 +1,6 @@
 # Python test set -- part 6, built-in types
 
-from test_support import *
+from test.test_support import *
 
 print '6. Built-in types'
 
index f7d3ce43a9116c00411e6934ae789eaab27e4a9f..1c8ed99724ba54f1f05a0d61d3e42ae8afb0ef63 100644 (file)
@@ -6,7 +6,7 @@ Modified for Python 2.0 by Fredrik Lundh (fredrik@pythonware.com)
 (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 
 print 'Testing General Unicode Character Name, and case insensitivity...',
 
index 7161f741128614da9a94c6c7f7270acc35f435df..9854f64d0ce1c69165d5d924590565058f570e20 100644 (file)
@@ -1,7 +1,7 @@
 """Test compiler changes for unary ops (+, -, ~) introduced in Python 2.2"""
 
 import unittest
-from test_support import run_unittest, have_unicode
+from test.test_support import run_unittest, have_unicode
 
 class UnaryOpTestCase(unittest.TestCase):
 
index 546505176f2b0d5cb1c0f15764c7487fc6a9ab4b..2218dfd10d616c44ab7a82612290016dfa02f91b 100644 (file)
@@ -5,7 +5,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
 (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-from test_support import verify, verbose, TestFailed
+from test.test_support import verify, verbose, TestFailed
 import sys, string
 
 if not sys.platform.startswith('java'):
index e46e1a9e37d2c8cbec242f38ce8b42d9226ce94a..a0de1394ed1dcd037a13df8fed4157538b9efacc 100644 (file)
@@ -3,9 +3,9 @@
 # that their names can be used with Unicode characters.
 import os, glob
 
-from test_support import verify, TestSkipped, TESTFN_UNICODE
+from test.test_support import verify, TestSkipped, TESTFN_UNICODE
 try:
-    from test_support import TESTFN_ENCODING
+    from test.test_support import TESTFN_ENCODING
     oldlocale = None
 except ImportError:
     import locale
index db03d35708e18f58d601a61a188d6a1c1f49819b..70b20d59c53c5138bf0eb093c9cd4bbb0a89265b 100644 (file)
@@ -5,7 +5,7 @@
     (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 import sha
 
 encoding = 'utf-8'
index 8de97350dfc5cd0529fb519d26839aadaace11df..8d89936247c9f7d299dceea524abb67a6388b5e5 100644 (file)
@@ -1,8 +1,8 @@
 # Tests universal newline support for both reading and parsing files.
 import unittest
-import test_support
 import os
 import sys
+from test import test_support
 
 if not hasattr(sys.stdin, 'newlines'):
     raise test_support.TestSkipped, \
index b913b9edcff3b8dfb7f25521a57ee02d22ef6382..fb225645b8ec4f8bf4f7acacf16488a29057d469 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import *
+from test.test_support import *
 
 t = (1, 2, 3)
 l = [4, 5, 6]
index e56438358d217c5953e2f85264befe78d0343be7..10236650788adef0e331045398757e69d8a6a30f 100644 (file)
@@ -1,5 +1,5 @@
 # Minimal test of the quote function
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 import urllib
 
 chars = 'abcdefghijklmnopqrstuvwxyz'\
index bb4fedbdd30eabc23badd6dcbfa701cc58316b37..8238bcae37659b6253f9713b7a69a2b599423e9b 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verify
+from test.test_support import verify
 import urllib2
 import os
 
index 2b3cf6ce0f62861aaccbdc6a70df567be451762f..d3efa9e1860f5ab2a40cf98922bc1a675e6248bf 100644 (file)
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-import test_support
+from test import test_support
 import unittest
 import urlparse
 
index 0f2fbb8f8e4e89dc75001bfcdffd0ca95d71edbf..d8024ed46d6619a78c9f5e8b5b352c1162d26455 100644 (file)
@@ -1,6 +1,6 @@
 # Check every path through every method of UserDict
 
-from test_support import verify, verbose
+from test.test_support import verify, verbose
 from UserDict import UserDict, IterableUserDict
 
 d0 = {}
index e655d1f6cbbaa88d437f97ccaa9ec82256b06d5d..af647b5b4e63974e687f17213368ad344a292da6 100644 (file)
@@ -1,7 +1,7 @@
 # Check every path through every method of UserList
 
 from UserList import UserList
-from test_support import TestFailed
+from test.test_support import TestFailed
 
 # Use check instead of assert so -O doesn't render the
 # test useless.
index 86997ce3741e184aa05ccaeb9feedc6f5a5dc784..78af807b53dd970b1e7459a0a1da0f5afb77be81 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import sys
-from test_support import verbose
-import string_tests
+from test.test_support import verbose
+from test import string_tests
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
 # The test cases were in part derived from 'test_string.py'.
index 07bd482a5efe155ca01c2484c9e360bc6b24b8ec..75d11080c03f6663f5bea9b1cd3cbad8dcf2a080 100644 (file)
@@ -3,7 +3,7 @@ Tests for uu module.
 Nick Mathewson
 """
 
-from test_support import verify, TestFailed, verbose, TESTFN
+from test.test_support import verify, TestFailed, verbose, TESTFN
 import sys, os
 import uu
 from StringIO import StringIO
index e2dc68892ddb95238541ffde705725ec5dea47a9..a0e913c0f4ee87eef7f2601669fcc6427364ce8e 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import TestFailed
+from test.test_support import TestFailed
 import os, tempfile
 import wave
 
index 076435841d914177811c591c59666ca645e8c940..d6a33d237be80bee35cedc4541b9517285e0ec08 100644 (file)
@@ -3,7 +3,7 @@ import unittest
 import UserList
 import weakref
 
-import test_support
+from test import test_support
 
 
 class C:
index ca38305074791ed482796f76132fe136c9adf803..f686c98b812fedd7d92fbc0df5bb1bfe62ab0902 100644 (file)
@@ -4,7 +4,7 @@
 from _winreg import *
 import os, sys
 
-from test_support import verify, have_unicode
+from test.test_support import verify, have_unicode
 
 test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
 
index afccfd887c4d054555c3e9143226531b6979b298..b14ead9aa06e212a87bfb4d06a8dbc0174bbcfe8 100644 (file)
@@ -17,7 +17,7 @@ import warnings
 warnings.filterwarnings("ignore", ".* xmllib .* obsolete.*",
                         DeprecationWarning, r'xmllib$')
 
-import test_support
+from test import test_support
 import unittest
 import xmllib
 
index 7934bc5c995de181c0eda9407b367ec70a07ba80..c6feb9691a3d33dc248fc259114b15702fb4ea8a 100644 (file)
@@ -1,7 +1,7 @@
 import sys
-import test_support
 import unittest
 import xmlrpclib
+from test import test_support
 
 alist = [{'astring': 'foo@bar.baz.spam',
           'afloat': 7283.43,
index eab8a60688939288ee742ed5ef4f5fcf8215522b..db9eb6bd43f69839bd7879bc145661cb5d2dd5ed 100644 (file)
@@ -1,4 +1,4 @@
-from test_support import verbose
+from test.test_support import verbose
 
 class XReader:
     def __init__(self):
index 480aeed7e78c51f728caf08a517cf8f38b9fd764..57f9a8972a679ab18b24492b79edfb641e6f7ca4 100644 (file)
@@ -1,6 +1,6 @@
 import zlib # implied prerequisite
 import zipfile, os, StringIO, tempfile
-from test_support import TestFailed
+from test.test_support import TestFailed
 
 srcname = "junk9630"+os.extsep+"tmp"
 zipname = "junk9708"+os.extsep+"tmp"
index 35bca88432050a9f62d99c49e8e598c413e16447..ab1c799c0408e39267d808f523619d07319012e6 100644 (file)
@@ -1,7 +1,7 @@
 import zlib
-from test_support import TestFailed
 import sys
 import imp
+from test.test_support import TestFailed
 
 try:
     t = imp.find_module('test_zlib')