diff options
194 files changed, 195 insertions, 1384 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index fc47bca90b..734e854933 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -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__) 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) diff --git a/Lib/email/test/test_email_codecs.py b/Lib/email/test/test_email_codecs.py index 63912efb37..0f681519e4 100644 --- a/Lib/email/test/test_email_codecs.py +++ b/Lib/email/test/test_email_codecs.py @@ -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 diff --git a/Lib/test/README b/Lib/test/README index 0aa2b1e804..13e740c2e7 100644 --- a/Lib/test/README +++ b/Lib/test/README @@ -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 Binary files differdeleted file mode 100644 index 1a5c87f647..0000000000 --- a/Lib/test/data/PyBanner048.gif +++ /dev/null diff --git a/Lib/test/data/msg_01.txt b/Lib/test/data/msg_01.txt deleted file mode 100644 index 7e33bcf96a..0000000000 --- a/Lib/test/data/msg_01.txt +++ /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 index 43f248038a..0000000000 --- a/Lib/test/data/msg_02.txt +++ /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 index c748ebf117..0000000000 --- a/Lib/test/data/msg_03.txt +++ /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 index 1f633c4496..0000000000 --- a/Lib/test/data/msg_04.txt +++ /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 index 87d5e9cbf8..0000000000 --- a/Lib/test/data/msg_05.txt +++ /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 index 69f3a47ff4..0000000000 --- a/Lib/test/data/msg_06.txt +++ /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 index 721f3a0d31..0000000000 --- a/Lib/test/data/msg_07.txt +++ /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" - -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 - ---BOUNDARY-- diff --git a/Lib/test/data/msg_08.txt b/Lib/test/data/msg_08.txt deleted file mode 100644 index b5630836c5..0000000000 --- a/Lib/test/data/msg_08.txt +++ /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 index 575c4c205a..0000000000 --- a/Lib/test/data/msg_09.txt +++ /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 index bd30d13ad1..0000000000 --- a/Lib/test/data/msg_10.txt +++ /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 index 8f7f1991cb..0000000000 --- a/Lib/test/data/msg_11.txt +++ /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 index 4bec8d9444..0000000000 --- a/Lib/test/data/msg_12.txt +++ /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 index 8e6d52d5be..0000000000 --- a/Lib/test/data/msg_13.txt +++ /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 index 5d98d2fd14..0000000000 --- a/Lib/test/data/msg_14.txt +++ /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 index 33b8487aaf..0000000000 --- a/Lib/test/data/msg_15.txt +++ /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Œr 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 index 56167e9f5b..0000000000 --- a/Lib/test/data/msg_16.txt +++ /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 index 8d86e4180d..0000000000 --- a/Lib/test/data/msg_17.txt +++ /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 index f9f4904d36..0000000000 --- a/Lib/test/data/msg_18.txt +++ /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 index 49bf7fccdd..0000000000 --- a/Lib/test/data/msg_19.txt +++ /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 index 1a6a88783e..0000000000 --- a/Lib/test/data/msg_20.txt +++ /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 index 5b2e777583..0000000000 --- a/Lib/test/data/msg_21.txt +++ /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 index af9de5fa27..0000000000 --- a/Lib/test/data/msg_22.txt +++ /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 index bb2e8ec36b..0000000000 --- a/Lib/test/data/msg_23.txt +++ /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 index 4e52339e86..0000000000 --- a/Lib/test/data/msg_24.txt +++ /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 index 9e35275fe0..0000000000 --- a/Lib/test/data/msg_25.txt +++ /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 index 292197b3fa..0000000000 --- a/Lib/test/data/msg_26.txt +++ /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 index d0191769d7..0000000000 --- a/Lib/test/data/msg_27.txt +++ /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 index 1e4824cabb..0000000000 --- a/Lib/test/data/msg_28.txt +++ /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 index 1fab561617..0000000000 --- a/Lib/test/data/msg_29.txt +++ /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 index 4334bb6e60..0000000000 --- a/Lib/test/data/msg_30.txt +++ /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-- diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 9c20c54030..4d71e219a4 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -64,8 +64,7 @@ import traceback import random import StringIO -import test_support - +from test import test_support RESOURCE_NAMES = ('curses', 'largefile', 'network') diff --git a/Lib/test/test_StringIO.py b/Lib/test/test_StringIO.py index 9deba0d85a..d8dc8b8000 100644 --- a/Lib/test/test_StringIO.py +++ b/Lib/test/test_StringIO.py @@ -4,7 +4,7 @@ import unittest import StringIO import cStringIO import types -import test_support +from test import test_support class TestGenericStringIO(unittest.TestCase): diff --git a/Lib/test/test___future__.py b/Lib/test/test___future__.py index fa8224f7b0..7507aed89d 100644 --- a/Lib/test/test___future__.py +++ b/Lib/test/test___future__.py @@ -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__ diff --git a/Lib/test/test_anydbm.py b/Lib/test/test_anydbm.py index 874e3b7dbc..54d278393e 100644 --- a/Lib/test/test_anydbm.py +++ b/Lib/test/test_anydbm.py @@ -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() diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 9a298875a1..023af9ae16 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -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(): diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py index a4e191497b..440adabd57 100644 --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -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' diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py index 02cbd49c23..223c38845f 100644 --- a/Lib/test/test_base64.py +++ b/Lib/test/test_base64.py @@ -1,5 +1,5 @@ import unittest -import test_support +from test import test_support import base64 from binascii import Error as binascii_error diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py index 2580fb21e2..2de35ce301 100755 --- a/Lib/test/test_binhex.py +++ b/Lib/test/test_binhex.py @@ -7,8 +7,8 @@ import binhex import os import tempfile -import test_support import unittest +from test import test_support class BinHexTestCase(unittest.TestCase): diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py index 976e7ffa10..1a4228928b 100644 --- a/Lib/test/test_binop.py +++ b/Lib/test/test_binop.py @@ -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.""" diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py index cadf23a10c..404b4e85eb 100644 --- a/Lib/test/test_bool.py +++ b/Lib/test/test_bool.py @@ -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): diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index 2059eaf355..c0b746b86d 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -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): diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py index 886bf18c2b..695ab56f14 100644 --- a/Lib/test/test_call.py +++ b/Lib/test/test_call.py @@ -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 diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index d01d3bf70c..fc31760c2d 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -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): diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py index 509c739ea0..c4096993b6 100755 --- a/Lib/test/test_cmath.py +++ b/Lib/test/test_cmath.py @@ -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, diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 28d84ce4a6..0362d2624f 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -1,4 +1,5 @@ -import test_support,unittest +from test import test_support +import unittest import codecs import StringIO diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py index fbe4a31853..a0ce0bcb7a 100644 --- a/Lib/test/test_codeop.py +++ b/Lib/test/test_codeop.py @@ -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 diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py index cf87fd457a..5ea08bc8b4 100644 --- a/Lib/test/test_commands.py +++ b/Lib/test/test_commands.py @@ -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: diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index c063855431..c9a139b5f5 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -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__" diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py index 7d452f5e0c..35befb209a 100644 --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -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 diff --git a/Lib/test/test_copy_reg.py b/Lib/test/test_copy_reg.py index 0f5c96f10d..08c7031920 100644 --- a/Lib/test/test_copy_reg.py +++ b/Lib/test/test_copy_reg.py @@ -1,6 +1,6 @@ import copy_reg -import test_support import unittest +from test import test_support class C: diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py index 874735bfce..0c34cda743 100644 --- a/Lib/test/test_cpickle.py +++ b/Lib/test/test_cpickle.py @@ -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): diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py index ca53ec5ee4..dfbcbdf228 100755 --- a/Lib/test/test_crypt.py +++ b/Lib/test/test_crypt.py @@ -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') diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py index 8020de1d42..f32dbf3e91 100644 --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -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): diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index b74194a615..3c6ddd62eb 100755 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -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' diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 2227eb8200..1dfc5abe87 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -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 diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index 32ca73d59c..017c1450aa 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -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__": diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index 9c63d9ad1d..5687e32770 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -1,2 +1,3 @@ -import difflib, test_support +import difflib +from test import test_support test_support.run_doctest(difflib) diff --git a/Lib/test/test_dircache.py b/Lib/test/test_dircache.py index 95dc2af437..2ec89a2dad 100644 --- a/Lib/test/test_dircache.py +++ b/Lib/test/test_dircache.py @@ -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 diff --git a/Lib/test/test_dl.py b/Lib/test/test_dl.py index 390dbd8afa..d1f73b2e04 100755 --- a/Lib/test/test_dl.py +++ b/Lib/test/test_dl.py @@ -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'), diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index f8ad6fdb6e..fd3426c91e 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -1,2 +1,3 @@ -import doctest, test_support +import doctest +from test import test_support test_support.run_doctest(doctest) diff --git a/Lib/test/test_doctest2.py b/Lib/test/test_doctest2.py index 00b6cc4482..31bf6e854c 100644 --- a/Lib/test/test_doctest2.py +++ b/Lib/test/test_doctest2.py @@ -5,7 +5,7 @@ like static and class methods. yup """ -import test_support +from test import test_support class C(object): """Class C. diff --git a/Lib/test/test_dospath.py b/Lib/test/test_dospath.py index 3cca1597eb..6bc1a5b6ae 100644 --- a/Lib/test/test_dospath.py +++ b/Lib/test/test_dospath.py @@ -1,6 +1,6 @@ import dospath -import test_support import unittest +from test import test_support class DOSPathTestCase(unittest.TestCase): diff --git a/Lib/test/test_dumbdbm.py b/Lib/test/test_dumbdbm.py index f3675a537d..7417f12eb6 100644 --- a/Lib/test/test_dumbdbm.py +++ b/Lib/test/test_dumbdbm.py @@ -4,10 +4,10 @@ """ import os -import test_support import unittest import dumbdbm import tempfile +from test import test_support _fname = tempfile.mktemp() diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py index e1683fdfca..1fa94799b7 100644 --- a/Lib/test/test_enumerate.py +++ b/Lib/test/test_enumerate.py @@ -1,6 +1,6 @@ import unittest -import test_support +from test import test_support seq, res = 'abc', [(0,'a'), (1,'b'), (2,'c')] diff --git a/Lib/test/test_errno.py b/Lib/test/test_errno.py index cb1e729f8e..78693281eb 100755 --- a/Lib/test/test_errno.py +++ b/Lib/test/test_errno.py @@ -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', diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index cc4f2134b3..530ca0c0df 100755 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -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 diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index fe908605e8..3a82c7c71f 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -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 diff --git a/Lib/test/test_fnmatch.py b/Lib/test/test_fnmatch.py index 0bd7d6a96c..9abcbd6f28 100644 --- a/Lib/test/test_fnmatch.py +++ b/Lib/test/test_fnmatch.py @@ -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 diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 127a407dcc..def8e656e1 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -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 diff --git a/Lib/test/test_fpformat.py b/Lib/test/test_fpformat.py index d4a5eb25ab..a1b872262a 100644 --- a/Lib/test/test_fpformat.py +++ b/Lib/test/test_fpformat.py @@ -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 diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index 764584c10a..62bc8573fc 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -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+)') diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py index 977f7b00e2..40edd30b75 100644 --- a/Lib/test/test_gc.py +++ b/Lib/test/test_gc.py @@ -1,4 +1,4 @@ -from test_support import verify, verbose, TestFailed +from test.test_support import verify, verbose, TestFailed import sys import gc diff --git a/Lib/test/test_gdbm.py b/Lib/test/test_gdbm.py index d3640160c4..03a47d9c24 100755 --- a/Lib/test/test_gdbm.py +++ b/Lib/test/test_gdbm.py @@ -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' diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 55a6a98888..170d92ec72 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -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 diff --git a/Lib/test/test_getopt.py b/Lib/test/test_getopt.py index e2ae9fed41..70ea65b4b0 100644 --- a/Lib/test/test_getopt.py +++ b/Lib/test/test_getopt.py @@ -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): diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py index 8cf6ecf471..cfc30771e7 100644 --- a/Lib/test/test_glob.py +++ b/Lib/test/test_glob.py @@ -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 diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index a16a922956..a8d78ba274 100755 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -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): diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py index f8a1523cc6..90e80fc94d 100644 --- a/Lib/test/test_hash.py +++ b/Lib/test/test_hash.py @@ -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): diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py index b7b3c07924..f9cd73e642 100644 --- a/Lib/test/test_hmac.py +++ b/Lib/test/test_hmac.py @@ -1,6 +1,6 @@ import hmac import unittest -import test_support +from test import test_support class TestVectorsTestCase(unittest.TestCase): def test_vectors(self): diff --git a/Lib/test/test_hotshot.py b/Lib/test/test_hotshot.py index 2a45a7f527..c4d2484931 100644 --- a/Lib/test/test_hotshot.py +++ b/Lib/test/test_hotshot.py @@ -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 diff --git a/Lib/test/test_htmllib.py b/Lib/test/test_htmllib.py index 620853d3ba..e283d1118f 100644 --- a/Lib/test/test_htmllib.py +++ b/Lib/test/test_htmllib.py @@ -2,7 +2,7 @@ import formatter import htmllib import unittest -import test_support +from test import test_support class AnchorCollector(htmllib.HTMLParser): diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py index 9d60dd8aef..8422751cef 100755 --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -3,8 +3,8 @@ import HTMLParser import pprint import sys -import test_support import unittest +from test import test_support class EventCollector(HTMLParser.HTMLParser): diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py index ff83c45e53..7b32bbc36c 100755 --- a/Lib/test/test_imageop.py +++ b/Lib/test/test_imageop.py @@ -5,7 +5,7 @@ Roger E. Masse """ -from test_support import verbose, unlink +from test.test_support import verbose, unlink import imageop, uu, os diff --git a/Lib/test/test_imgfile.py b/Lib/test/test_imgfile.py index e99b75873f..bdfd796b1e 100755 --- a/Lib/test/test_imgfile.py +++ b/Lib/test/test_imgfile.py @@ -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 diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 1ddd13e6b2..f946445bd9 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -1,4 +1,4 @@ -from test_support import TESTFN, TestFailed +from test.test_support import TESTFN, TestFailed import os import random diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 58b757084a..ccfba34ea6 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -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): diff --git a/Lib/test/test_isinstance.py b/Lib/test/test_isinstance.py index ebdcbb4b07..8dfb956653 100644 --- a/Lib/test/test_isinstance.py +++ b/Lib/test/test_isinstance.py @@ -3,7 +3,7 @@ # testing of error conditions uncovered when using extension types. import unittest -import test_support +from test import test_support diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py index 0085db5dc1..509ec01b27 100644 --- a/Lib/test/test_iter.py +++ b/Lib/test/test_iter.py @@ -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), diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py index 8bff5df45e..7287e6dd72 100644 --- a/Lib/test/test_largefile.py +++ b/Lib/test/test_largefile.py @@ -5,7 +5,7 @@ # #---------------------------------------------------------------------- -import test_support +from test import test_support import os, struct, stat, sys try: diff --git a/Lib/test/test_linuxaudiodev.py b/Lib/test/test_linuxaudiodev.py index cc44d8b508..9f44629dfc 100644 --- a/Lib/test/test_linuxaudiodev.py +++ b/Lib/test/test_linuxaudiodev.py @@ -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 diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 0040a20899..2e056cfe10 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -1,4 +1,4 @@ -from test_support import verbose +from test.test_support import verbose import locale import sys diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py index 5e98225c3a..78224128aa 100644 --- a/Lib/test/test_long.py +++ b/Lib/test/test_long.py @@ -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 diff --git a/Lib/test/test_long_future.py b/Lib/test/test_long_future.py index cb0ac58b08..074c1489f9 100644 --- a/Lib/test/test_long_future.py +++ b/Lib/test/test_long_future.py @@ -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: diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index bb75e64df9..dc89fd8a71 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -1,8 +1,8 @@ import mailbox import os -import test_support import time import unittest +from test import test_support # cleanup earlier tests try: diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index 38b3cd4698..53772246eb 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -1,4 +1,4 @@ -from test_support import TestFailed +from test.test_support import TestFailed import marshal import sys diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index d64024f41f..51013815ff 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -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) diff --git a/Lib/test/test_mhlib.py b/Lib/test/test_mhlib.py index ef5877de03..862d301cb7 100644 --- a/Lib/test/test_mhlib.py +++ b/Lib/test/test_mhlib.py @@ -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 diff --git a/Lib/test/test_mimetools.py b/Lib/test/test_mimetools.py index 0300714d76..79464a2eaf 100644 --- a/Lib/test/test_mimetools.py +++ b/Lib/test/test_mimetools.py @@ -1,4 +1,4 @@ -from test_support import TestFailed +from test.test_support import TestFailed import mimetools import string,StringIO diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py index d0a32a9ffa..69539663ca 100644 --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -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 = [] diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index ac5b04c130..4d7a1af081 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -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 diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 4fb4ec10c5..11edbaf797 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -1,4 +1,4 @@ -from test_support import verify, vereq, TESTFN +from test.test_support import verify, vereq, TESTFN import mmap import os, re diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py index f3bf3d8775..2b35a531af 100644 --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -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) diff --git a/Lib/test/test_mpz.py b/Lib/test/test_mpz.py index 804dc6bc3d..dc583ae7f4 100644 --- a/Lib/test/test_mpz.py +++ b/Lib/test/test_mpz.py @@ -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) diff --git a/Lib/test/test_mutants.py b/Lib/test/test_mutants.py index 9ee1bb7537..60a17aa8e5 100644 --- a/Lib/test/test_mutants.py +++ b/Lib/test/test_mutants.py @@ -1,4 +1,4 @@ -from test_support import verbose, TESTFN +from test.test_support import verbose, TESTFN import random import os diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py index 2cf1ae4dce..034b10550f 100644 --- a/Lib/test/test_netrc.py +++ b/Lib/test/test_netrc.py @@ -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 diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py index eb762f7dec..c56f13fc42 100644 --- a/Lib/test/test_new.py +++ b/Lib/test/test_new.py @@ -1,4 +1,4 @@ -from test_support import verbose, verify +from test.test_support import verbose, verify import sys import new diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py index e1670d16e5..f5224fec3a 100644 --- a/Lib/test/test_nis.py +++ b/Lib/test/test_nis.py @@ -1,4 +1,4 @@ -from test_support import verbose, TestFailed, TestSkipped +from test.test_support import verbose, TestFailed, TestSkipped import nis print 'nis.maps()' diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 4dee1fc00c..40d785f04e 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -1,5 +1,5 @@ import ntpath -from test_support import verbose, TestFailed +from test.test_support import verbose, TestFailed import os errors = 0 diff --git a/Lib/test/test_opcodes.py b/Lib/test/test_opcodes.py index 31569d5fcb..515df6c1d4 100644 --- a/Lib/test/test_opcodes.py +++ b/Lib/test/test_opcodes.py @@ -1,6 +1,6 @@ # Python test set -- part 2, opcodes -from test_support import * +from test.test_support import * print '2. Opcodes' diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py index fb817193d5..858c9ea4db 100644 --- a/Lib/test/test_openpty.py +++ b/Lib/test/test_openpty.py @@ -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: diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py index 439d340ce3..f1e2959545 100644 --- a/Lib/test/test_operator.py +++ b/Lib/test/test_operator.py @@ -1,7 +1,7 @@ import operator import unittest -import test_support +from test import test_support class OperatorTestCase(unittest.TestCase): diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 735d4cb253..347c4458f9 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -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): diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index 5df1e46131..a28875e004 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -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, diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index 6265676533..935a763262 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -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): diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py index c9e771dc08..224cefade5 100644 --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -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. diff --git a/Lib/test/test_pkgimport.py b/Lib/test/test_pkgimport.py index 8c7a99be82..523ba5a235 100644 --- a/Lib/test/test_pkgimport.py +++ b/Lib/test/test_pkgimport.py @@ -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): diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py index f6d427ccd5..ed1d736793 100644 --- a/Lib/test/test_poll.py +++ b/Lib/test/test_poll.py @@ -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 diff --git a/Lib/test/test_popen.py b/Lib/test/test_popen.py index 17491d8410..9111ec5e49 100644 --- a/Lib/test/test_popen.py +++ b/Lib/test/test_popen.py @@ -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. diff --git a/Lib/test/test_popen2.py b/Lib/test/test_popen2.py index c67dd712d9..cf3a09465a 100644 --- a/Lib/test/test_popen2.py +++ b/Lib/test/test_popen2.py @@ -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 diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index 7a38f678d2..2b3465c7f9 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -1,5 +1,5 @@ import sys -import test_support +from test import test_support def powtest(type): diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index d5e10aa458..293b75f150 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -1,7 +1,6 @@ import pprint import unittest - -import test_support +from test import test_support try: uni = unicode diff --git a/Lib/test/test_profilehooks.py b/Lib/test/test_profilehooks.py index 8990e2ced2..75599d907b 100644 --- a/Lib/test/test_profilehooks.py +++ b/Lib/test/test_profilehooks.py @@ -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() diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 204ff56922..eb833f0443 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -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" diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py index 2cb122beee..75d083bc9d 100644 --- a/Lib/test/test_pwd.py +++ b/Lib/test/test_pwd.py @@ -1,4 +1,4 @@ -from test_support import verbose +from test.test_support import verbose import pwd print 'pwd.getpwall()' diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py index ae3a5bd769..61d59f77b4 100644 --- a/Lib/test/test_pyclbr.py +++ b/Lib/test/test_pyclbr.py @@ -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 diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py index 2415ff0b81..09314c37ce 100644 --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -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): diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py index c0b94d5926..a2c744fe59 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -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 diff --git a/Lib/test/test_quopri.py b/Lib/test/test_quopri.py index 2497705a2d..dedda8d8dd 100644 --- a/Lib/test/test_quopri.py +++ b/Lib/test/test_quopri.py @@ -1,4 +1,4 @@ -import test_support +from test import test_support import unittest from cStringIO import StringIO diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index d508c9fa65..5f60f4b7b2 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -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 diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 45bb3b14ec..5475416924 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -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 diff --git a/Lib/test/test_regex.py b/Lib/test/test_regex.py index 0fe82b7f1d..dbc6ec3041 100644 --- a/Lib/test/test_regex.py +++ b/Lib/test/test_regex.py @@ -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$') diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py index f8aad94f95..14cf181eed 100644 --- a/Lib/test/test_repr.py +++ b/Lib/test/test_repr.py @@ -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 diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index 1293833e30..12b8134a6a 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -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 diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py index 756c5c759c..0bdd99afb3 100644 --- a/Lib/test/test_rfc822.py +++ b/Lib/test/test_rfc822.py @@ -1,7 +1,7 @@ import rfc822 import sys -import test_support import unittest +from test import test_support try: from cStringIO import StringIO diff --git a/Lib/test/test_rgbimg.py b/Lib/test/test_rgbimg.py index b632cd074e..010b3b5fd0 100644 --- a/Lib/test/test_rgbimg.py +++ b/Lib/test/test_rgbimg.py @@ -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 diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py index 4e7d45925d..f4c2c7f43e 100644 --- a/Lib/test/test_richcmp.py +++ b/Lib/test/test_richcmp.py @@ -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: diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py index beec006789..6a23b22db3 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -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): diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py index 32b7609cc6..acb765863d 100644 --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -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 diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py index f39bbc2037..bf9a658478 100644 --- a/Lib/test/test_scope.py +++ b/Lib/test/test_scope.py @@ -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>") diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py index e2c3cfef63..1bc2ba927a 100644 --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -1,5 +1,5 @@ # Testing select module -from test_support import verbose +from test.test_support import verbose import select import os diff --git a/Lib/test/test_sgmllib.py b/Lib/test/test_sgmllib.py index ff0af9e323..f6f1309353 100644 --- a/Lib/test/test_sgmllib.py +++ b/Lib/test/test_sgmllib.py @@ -1,7 +1,7 @@ import pprint import sgmllib -import test_support import unittest +from test import test_support class EventCollector(sgmllib.SGMLParser): diff --git a/Lib/test/test_sha.py b/Lib/test/test_sha.py index cad7780467..c438cc6417 100644 --- a/Lib/test/test_sha.py +++ b/Lib/test/test_sha.py @@ -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): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 951e58ad3e..737f1608c9 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -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 diff --git a/Lib/test/test_slice.py b/Lib/test/test_slice.py index 895238f106..a837abe45e 100644 --- a/Lib/test/test_slice.py +++ b/Lib/test/test_slice.py @@ -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)) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index cd23f8b5ee..0b36136330 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import unittest -import test_support +from test import test_support import socket import select diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py index 2645876328..9c0d8cce39 100644 --- a/Lib/test/test_socket_ssl.py +++ b/Lib/test/test_socket_ssl.py @@ -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 diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 19b5bf58f2..29c8c37d22 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -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 * diff --git a/Lib/test/test_softspace.py b/Lib/test/test_softspace.py index ba860ebf85..5405ba3fe9 100644 --- a/Lib/test/test_softspace.py +++ b/Lib/test/test_softspace.py @@ -1,4 +1,4 @@ -import test_support +from test import test_support import StringIO # SF bug 480215: softspace confused in nested print diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py index abd55db1d6..4f2aae84b7 100644 --- a/Lib/test/test_sre.py +++ b/Lib/test/test_sre.py @@ -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 diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 4ce72b9880..9bd045d894 100755 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -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 diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py index cc61512a73..af8c1bce66 100644 --- a/Lib/test/test_string.py +++ b/Lib/test/test_string.py @@ -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 diff --git a/Lib/test/test_strop.py b/Lib/test/test_strop.py index 1e3febab06..4f5ba000d7 100644 --- a/Lib/test/test_strop.py +++ b/Lib/test/test_strop.py @@ -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): diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 34abad55ea..b9895d458e 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -1,4 +1,4 @@ -from test_support import TestFailed, verbose, verify +from test.test_support import TestFailed, verbose, verify import struct ## import pdb diff --git a/Lib/test/test_structseq.py b/Lib/test/test_structseq.py index c09e0691cd..2760d722b4 100644 --- a/Lib/test/test_structseq.py +++ b/Lib/test/test_structseq.py @@ -1,4 +1,4 @@ -from test_support import vereq +from test.test_support import vereq import time diff --git a/Lib/test/test_sunaudiodev.py b/Lib/test/test_sunaudiodev.py index 4864ec5be2..f203d9a304 100644 --- a/Lib/test/test_sunaudiodev.py +++ b/Lib/test/test_sunaudiodev.py @@ -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 diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py index bd33b82c28..48f5c68e5e 100644 --- a/Lib/test/test_sundry.py +++ b/Lib/test/test_sundry.py @@ -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 diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py index 56d772ea45..44f156e8bf 100644 --- a/Lib/test/test_symtable.py +++ b/Lib/test/test_symtable.py @@ -1,4 +1,4 @@ -from test_support import verify +from test.test_support import verify import _symtable diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 6605e27d72..c5c4f6376f 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -1,7 +1,7 @@ import re import unittest -import test_support +from test import test_support class SyntaxTestCase(unittest.TestCase): diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index a45fb2fd5b..ea345b60a0 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -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 diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py index d9f3d70573..8bdae4249d 100644 --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -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() diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py index 9aa93763e3..2b5ecf2511 100644 --- a/Lib/test/test_threadedtempfile.py +++ b/Lib/test/test_threadedtempfile.py @@ -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 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 52301177de..cbf6202b5b 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -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 diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 7c6b3bac6b..460c9892b3 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -1,4 +1,4 @@ -import test_support +from test import test_support import time import unittest diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py index d79c4ee7d9..57185a2569 100644 --- a/Lib/test/test_timeout.py +++ b/Lib/test/test_timeout.py @@ -1,7 +1,7 @@ """Unit tests for socket timeout feature.""" import unittest -import test_support +from test import test_support import time import socket diff --git a/Lib/test/test_timing.py b/Lib/test/test_timing.py index 5dbc895385..5797833fc7 100644 --- a/Lib/test/test_timing.py +++ b/Lib/test/test_timing.py @@ -1,4 +1,4 @@ -from test_support import verbose +from test.test_support import verbose import timing r = range(100000) diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index 7ac5624e94..e3fbb15f86 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -1,4 +1,4 @@ -from test_support import verbose, findfile +from test.test_support import verbose, findfile import tokenize, os, sys if verbose: diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 1b0a124544..44221188f5 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -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 diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 87a70fb18d..7efca216fe 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -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' diff --git a/Lib/test/test_ucn.py b/Lib/test/test_ucn.py index f7d3ce43a9..1c8ed99724 100644 --- a/Lib/test/test_ucn.py +++ b/Lib/test/test_ucn.py @@ -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...', diff --git a/Lib/test/test_unary.py b/Lib/test/test_unary.py index 7161f74112..9854f64d0c 100644 --- a/Lib/test/test_unary.py +++ b/Lib/test/test_unary.py @@ -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): diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 546505176f..2218dfd10d 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -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'): diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py index e46e1a9e37..a0de1394ed 100644 --- a/Lib/test/test_unicode_file.py +++ b/Lib/test/test_unicode_file.py @@ -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 diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index db03d35708..70b20d59c5 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -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' diff --git a/Lib/test/test_univnewlines.py b/Lib/test/test_univnewlines.py index 8de97350df..8d89936247 100644 --- a/Lib/test/test_univnewlines.py +++ b/Lib/test/test_univnewlines.py @@ -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, \ diff --git a/Lib/test/test_unpack.py b/Lib/test/test_unpack.py index b913b9edcf..fb225645b8 100644 --- a/Lib/test/test_unpack.py +++ b/Lib/test/test_unpack.py @@ -1,4 +1,4 @@ -from test_support import * +from test.test_support import * t = (1, 2, 3) l = [4, 5, 6] diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index e56438358d..1023665078 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -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'\ diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index bb4fedbdd3..8238bcae37 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1,4 +1,4 @@ -from test_support import verify +from test.test_support import verify import urllib2 import os diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 2b3cf6ce0f..d3efa9e186 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -import test_support +from test import test_support import unittest import urlparse diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py index 0f2fbb8f8e..d8024ed46d 100644 --- a/Lib/test/test_userdict.py +++ b/Lib/test/test_userdict.py @@ -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 = {} diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py index e655d1f6cb..af647b5b4e 100644 --- a/Lib/test/test_userlist.py +++ b/Lib/test/test_userlist.py @@ -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. diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py index 86997ce374..78af807b53 100755 --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -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'. diff --git a/Lib/test/test_uu.py b/Lib/test/test_uu.py index 07bd482a5e..75d11080c0 100644 --- a/Lib/test/test_uu.py +++ b/Lib/test/test_uu.py @@ -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 diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py index e2dc68892d..a0e913c0f4 100644 --- a/Lib/test/test_wave.py +++ b/Lib/test/test_wave.py @@ -1,4 +1,4 @@ -from test_support import TestFailed +from test.test_support import TestFailed import os, tempfile import wave diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 076435841d..d6a33d237b 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -3,7 +3,7 @@ import unittest import UserList import weakref -import test_support +from test import test_support class C: diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index ca38305074..f686c98b81 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -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" diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py index afccfd887c..b14ead9aa0 100644 --- a/Lib/test/test_xmllib.py +++ b/Lib/test/test_xmllib.py @@ -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 diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index 7934bc5c99..c6feb9691a 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -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, diff --git a/Lib/test/test_xreadline.py b/Lib/test/test_xreadline.py index eab8a60688..db9eb6bd43 100644 --- a/Lib/test/test_xreadline.py +++ b/Lib/test/test_xreadline.py @@ -1,4 +1,4 @@ -from test_support import verbose +from test.test_support import verbose class XReader: def __init__(self): diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 480aeed7e7..57f9a8972a 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -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" diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index 35bca88432..ab1c799c04 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -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') |
