consolidated externals and enteries because enteries need to file to

interate over and both get called by the same callback.
pep8 on svn_utils

--HG--
extra : rebase_source : fa65ebfc167041b5c2e1b2bd901e9354cfaea57e

1 files changed, 5 insertions, 8 deletions

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 6f8399dd..7f5f6108 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -17,6 +17,7 @@ from setuptools.command import sdist
 #requires python >= 2.4
 from subprocess import call as _call
 
+
 def _remove_dir(target):
 
     #on windows this seems to a problem
@@ -26,6 +27,7 @@ def _remove_dir(target):
             os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
     shutil.rmtree(target)
 
+
 class TestSvnVersion(unittest.TestCase):
 
     def test_no_svn_found(self):
@@ -68,21 +70,16 @@ class TestSvn_1_7(unittest.TestCase):
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '4')
 
-    def test_entry_iterator(self):
+    def test_iterator(self):
         expected = set([
             os.path.join('.', 'readme.txt'),
             os.path.join('.', 'other'),
-            ])
-        self.assertEqual(set(x for x in sdist.entries_finder('.', '')),
-                         expected)
-
-    def test_external_iterator(self):
-        expected = set([
             os.path.join('.', 'third_party'),
             os.path.join('.', 'third_party2'),
             os.path.join('.', 'third_party3'),
             ])
-        self.assertEqual(set(x for x in sdist.externals_finder('.', '')),
+        self.assertEqual(set(x for x
+                               in sdist.entries_externals_finder('.', '')),
                          expected)
 
 def test_suite():