From: <fwi...@us...> - 2006-11-13 03:38:55
|
Author: fwiemann Date: 2006-11-13 04:38:52 +0100 (Mon, 13 Nov 2006) New Revision: 4812 Modified: trunk/docutils/test/DocutilsTestSupport.py Log: removed Py21 compatibility code Modified: trunk/docutils/test/DocutilsTestSupport.py =================================================================== --- trunk/docutils/test/DocutilsTestSupport.py 2006-11-13 03:29:55 UTC (rev 4811) +++ trunk/docutils/test/DocutilsTestSupport.py 2006-11-13 03:38:52 UTC (rev 4812) @@ -65,6 +65,7 @@ from docutils.parsers import rst from docutils.parsers.rst import states, tableparser, roles, languages from docutils.readers import standalone, pep + from docutils.readers.python import moduleparser from docutils.statemachine import StringList, string2lines except ImportError: # The importing module (usually __init__.py in one of the @@ -75,12 +76,6 @@ traceback.print_exc() sys.exit(1) -try: - from docutils.readers.python import moduleparser - from tokenize import generate_tokens - del generate_tokens -except ImportError: # moduleparser depends on modules added in Python 2.2 - moduleparser = None try: import mypdb as pdb @@ -635,17 +630,6 @@ A collection of PythonModuleParserTestCase. """ - notified = None - - def __init__(self, *args, **kwargs): - if moduleparser is None: - if not self.notified: - print ('Tests of docutils.readers.python skipped; ' - 'Python 2.2 or higher required.') - PythonModuleParserTestSuite.notified = 1 - self.generateTests = self.generate_no_tests - CustomTestSuite.__init__(self, *args, **kwargs) - def generateTests(self, dict, dictname='totest', testmethod='test_parser'): """ |