From: Barry Warsaw <barry@python.org>
Date: Mon, 30 Dec 2002 17:45:02 +0000 (+0000)
Subject: TestMIMEAudio.setUp(): Use the email package's copy of the audio test
X-Git-Tag: v2.3c1~2819
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f29ffbdbf5a70f5230ce130372055924f71277a6;p=thirdparty%2FPython%2Fcpython.git

TestMIMEAudio.setUp(): Use the email package's copy of the audio test
file, needed because some binary distros (read RPMs) don't include the
test module in their standard Python package.  This eliminates an
external dependency and closes SF bug # 650441.
---

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index df6c350957ba..7c79739bd637 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -769,8 +769,13 @@ Blah blah blah
 # Test the basic MIMEAudio class
 class TestMIMEAudio(unittest.TestCase):
     def setUp(self):
-        # In Python, audiotest.au lives in Lib/test not Lib/test/data
-        fp = open(findfile('audiotest.au'), 'rb')
+        # Make sure we pick up the audiotest.au that lives in email/test/data.
+        # In Python, there's an audiotest.au living in Lib/test but that isn't
+        # included in some binary distros that don't include the test
+        # package.  The trailing empty string on the .join() is significant
+        # since findfile() will do a dirname().
+        datadir = os.path.join(os.path.dirname(landmark), 'data', '')
+        fp = open(findfile('audiotest.au', datadir), 'rb')
         try:
             self._audiodata = fp.read()
         finally: