got some global version done, SVN 1.3.x or later now required

--HG--
extra : rebase_source : def9ab923ee6455791c92334ee79c09d9164c43e

3 files changed, 11 insertions, 3 deletions

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 81b92f44..70ab2c84 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -63,7 +63,7 @@ def _default_revctrl(dirname=''):
 
 def externals_finder(dirname, filename):
     """Find any 'svn:externals' directories"""
-    for name in SVNEnteries.load(dirname).get_external_dirs(filename):
+    for name in svn_utils.parse_externals(dirname):
         yield joinpath(dirname, name)
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index f373379c..5783489c 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -94,7 +94,7 @@ def _get_entry_schedule(entry):
 #-R without --xml parses a bit funny

 def parse_externals(path):

     try:

-        _, lines = _run_command(['svn',

+        code, lines = _run_command(['svn',

                                  'propget', 'svn:externals', path])

 

         if code:

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 678508c0..44637909 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -91,11 +91,19 @@ class TestSvn_1_7(unittest.TestCase):
         expected = set([
             os.path.join('.', 'readme.txt'),
             os.path.join('.', 'other'),
-            os.path.join('.', 'other', 'test.py'),
             ])
         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('.', '')),
+                         expected)
+
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)