[Docutils-checkins] SF.net SVN: docutils:[8333] trunk/docutils

[<mi...@us...>]

Revision: 8333
          http://sourceforge.net/p/docutils/code/8333
Author:   milde
Date:     2019-08-21 12:38:01 +0000 (Wed, 21 Aug 2019)
Log Message:
-----------
Remove legacy ImportError exception handlers (patch by Stephen Finucane).

See https://sourceforge.net/p/docutils/patches/150/

Modified Paths:
--------------
    trunk/docutils/test/test_dependencies.py
    trunk/docutils/tools/test/test_buildhtml.py

Modified: trunk/docutils/test/test_dependencies.py
===================================================================
--- trunk/docutils/test/test_dependencies.py	2019-08-21 11:55:48 UTC (rev 8332)
+++ trunk/docutils/test/test_dependencies.py	2019-08-21 12:38:01 UTC (rev 8333)
@@ -8,9 +8,9 @@
 Test module for the --record-dependencies option.
 """
 
+import csv
 import os.path
 import unittest
-import sys
 import DocutilsTestSupport              # must be imported before docutils
 import docutils.core
 import docutils.utils
@@ -89,13 +89,9 @@
         self.assertEqual(record, expected)
 
     def test_csv_dependencies(self):
-        try:
-            import csv
-            csvsource = os.path.join('data', 'csv_dep.txt')
-            self.assertEqual(self.get_record(source_path=csvsource),
-                             ['data/csv_data.txt'])
-        except ImportError:
-            pass
+        csvsource = os.path.join('data', 'csv_dep.txt')
+        self.assertEqual(self.get_record(source_path=csvsource),
+                         ['data/csv_data.txt'])
 
     def test_stylesheet_dependencies(self):
         stylesheet = paths['stylesheet']

Modified: trunk/docutils/tools/test/test_buildhtml.py
===================================================================
--- trunk/docutils/tools/test/test_buildhtml.py	2019-08-21 11:55:48 UTC (rev 8332)
+++ trunk/docutils/tools/test/test_buildhtml.py	2019-08-21 12:38:01 UTC (rev 8333)
@@ -24,15 +24,8 @@
 
 import unittest
 import os
-import re
-try:
-    import tempfile
-except ImportError:
-    pass
-try:
-    from subprocess import Popen, PIPE, STDOUT
-except ImportError:
-    pass
+from subprocess import Popen, PIPE, STDOUT
+import tempfile
 
 
 buildhtml_path = os.path.abspath(os.path.join(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.