Commit 26d4bb13 authored by Jason R. Coombs's avatar Jason R. Coombs

Remove doctests module. It is now part of Python.

parent 508f0f51
...@@ -20,7 +20,6 @@ class ScanningLoader(TestLoader): ...@@ -20,7 +20,6 @@ class ScanningLoader(TestLoader):
the return value to the tests. the return value to the tests.
""" """
tests = [] tests = []
if module.__name__ != 'setuptools.tests.doctest': # ugh
tests.append(TestLoader.loadTestsFromModule(self, module)) tests.append(TestLoader.loadTestsFromModule(self, module))
if hasattr(module, "additional_tests"): if hasattr(module, "additional_tests"):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import sys import sys
import os import os
import unittest import unittest
from setuptools.tests import doctest import doctest
import distutils.core import distutils.core
import distutils.cmd import distutils.cmd
from distutils.errors import DistutilsOptionError, DistutilsPlatformError from distutils.errors import DistutilsOptionError, DistutilsPlatformError
...@@ -18,7 +18,6 @@ from setuptools import Feature ...@@ -18,7 +18,6 @@ from setuptools import Feature
from setuptools.depends import Require from setuptools.depends import Require
def additional_tests(): def additional_tests():
import doctest, unittest
suite = unittest.TestSuite(( suite = unittest.TestSuite((
doctest.DocFileSuite( doctest.DocFileSuite(
os.path.join('tests', 'api_tests.txt'), os.path.join('tests', 'api_tests.txt'),
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment