From: Thomas Heller <theller@ctypes.org>
Date: Tue, 4 Apr 2006 18:52:27 +0000 (+0000)
Subject: Change the import statement so that the test is skipped when
X-Git-Tag: v2.5a1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b882f473832fb51e2476cb72b721994912a67ddb;p=python

Change the import statement so that the test is skipped when
os.startfile is not present.
---

diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
index 2b198e4a44..5c3d17d705 100644
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -9,25 +9,26 @@
 
 import unittest
 from test import test_support
-import os
 
+# use this form so that the test is skipped when startfile is not available:
+from os import startfile
 
 class TestCase(unittest.TestCase):
     def test_nonexisting(self):
-        self.assertRaises(OSError, os.startfile, "nonexisting.vbs")
+        self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_nonexisting_u(self):
-        self.assertRaises(OSError, os.startfile, u"nonexisting.vbs")
+        self.assertRaises(OSError, startfile, u"nonexisting.vbs")
 
     def test_empty(self):
         empty = os.path.join(os.path.dirname(__file__), "empty.vbs")
-        os.startfile(empty)
-        os.startfile(empty, "open")
+        startfile(empty)
+        startfile(empty, "open")
 
     def test_empty_u(self):
         empty = os.path.join(os.path.dirname(__file__), "empty.vbs")
-        os.startfile(unicode(empty, "mbcs"))
-        os.startfile(unicode(empty, "mbcs"), "open")
+        startfile(unicode(empty, "mbcs"))
+        startfile(unicode(empty, "mbcs"), "open")
 
 def test_main():
     test_support.run_unittest(TestCase)