Chase upstream

3 files changed, 4 insertions, 5 deletions

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 831d6042..34fdeec2 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -14,7 +14,7 @@ import textwrap
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
-from setuptools.compat import basestring, next
+from setuptools.compat import basestring
 from setuptools.extension import Library
 from setuptools import Command
 
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1818edc..1ef723da 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -320,7 +320,7 @@ class manifest_maker(sdist):
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
         sep = re.escape(os.sep)
-        self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep, 
+        self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep,
                                       is_regex=1)
 
 
@@ -389,7 +389,7 @@ def write_toplevel_names(cmd, basename, filename):
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n')
+    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 18e90ffc..1038da71 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -20,8 +20,7 @@ class ScanningLoader(TestLoader):
         the return value to the 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"):
             tests.append(module.additional_tests())