test_buildhtml: Drop obsolete NameError handling

It was added in r7442 because the imports were optional, however since
r8333 the imports are unconditional, so the NameError will never be
raised.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8498 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 4 insertions, 11 deletions

diff --git a/docutils/tools/test/test_buildhtml.py b/docutils/tools/test/test_buildhtml.py
index b2b7038dd..335f881c1 100644
--- a/docutils/tools/test/test_buildhtml.py
+++ b/docutils/tools/test/test_buildhtml.py
@@ -35,12 +35,9 @@ buildhtml_path = os.path.abspath(os.path.join(
 def process_and_return_filelist(options):
     dirs = []
     files = []
-    try:
-        p = Popen(buildhtml_path+" "+options, shell=True,
-                  stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
-        (cin, cout) = (p.stdin, p.stdout)
-    except NameError:
-        cin, cout = os.popen4(buildhtml_path+" "+options)
+    p = Popen(buildhtml_path+" "+options, shell=True,
+              stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
+    (cin, cout) = (p.stdin, p.stdout)
     while True:
         line = cout.readline()
         if not line:
@@ -73,11 +70,7 @@ class BuildHtmlTests(unittest.TestCase):
              )
 
     def setUp(self):
-        try:
-            self.root = tempfile.mkdtemp()
-        except NameError:
-            self.root = os.tempnam()
-            os.mkdir(self.root)
+        self.root = tempfile.mkdtemp()
 
         for s in self.tree:
             s = os.path.join(self.root, s)