Merge fix for doctest failures on Python 3. Fixes #277.

--HG--
branch : distribute
extra : rebase_source : 83d0018693f318b6eafdd90d042e9a90ae36b69f

1 files changed, 2 insertions, 2 deletions

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 207b4e0a..54c9902e 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,14 +10,13 @@ from distutils.errors import DistutilsSetupError
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-import unittest
-
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools import Feature
 from setuptools.depends import Require
 
 def additional_tests():
+    import doctest, unittest
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
             os.path.join('tests', 'api_tests.txt'),