aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-04-14 18:17:54 +0000
committerJason R. Coombs <jaraco@jaraco.com>2012-04-14 18:17:54 +0000
commit4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a (patch)
treea4afe90dd70780a778f5ca470921a24578316018
parent5ac3e0119a483c7d9bb43148d2b6f16c546913ff (diff)
downloadexternal_python_setuptools-4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a.tar.gz
external_python_setuptools-4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a.tar.bz2
external_python_setuptools-4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a.zip
Fixed test failures in the doctests on Python 3.
--HG-- branch : distribute extra : rebase_source : e3c57d5c2650be765d7e152e191f7c7a0e7c578d
-rw-r--r--setuptools/tests/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fec3854d..78ac920f 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,6 +1,7 @@
"""Tests for the 'setuptools' package"""
import sys
import os
+import unittest
import doctest
import distutils.core
import distutils.cmd
@@ -9,13 +10,12 @@ from distutils.errors import DistutilsSetupError
from distutils.core import Extension
from distutils.version import LooseVersion
-import unittest
-
import setuptools.dist
from setuptools import Feature
from setuptools.depends import Require, find_module, get_module_constant, extract_constant
def additional_tests():
+ import doctest, unittest
suite = unittest.TestSuite((
doctest.DocFileSuite(
os.path.join('tests', 'api_tests.txt'),