diff options
| -rwxr-xr-x | setuptools/command/sdist.py | 3 | ||||
| -rw-r--r-- | setuptools/svn_utils.py | 15 |
2 files changed, 2 insertions, 16 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 3614da5e..2a37c308 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -5,6 +5,7 @@ from glob import glob import os, re, sys, pkg_resources from glob import glob from setuptools.svn_utils import SVNEntries +from setuptools import svn_utils READMES = ('README', 'README.rst', 'README.txt') @@ -69,7 +70,7 @@ def externals_finder(dirname, filename): def entries_finder(dirname, filename): for record in SVNEntries.load(dirname).get_undeleted_records(): yield joinpath(dirname, record) - + finders = [ (convert_path('CVS/Entries'), diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py index e45f05bc..93912b1a 100644 --- a/setuptools/svn_utils.py +++ b/setuptools/svn_utils.py @@ -185,9 +185,6 @@ class SVNEntriesText(SVNEntries): def is_valid(self):
return bool(self.get_sections())
- def get_url(self):
- return self.get_sections()[0][4]
-
def parse_revision_numbers(self):
revision_line_number = 9
rev_numbers = [
@@ -213,11 +210,6 @@ class SVNEntriesXML(SVNEntries): def is_valid(self):
return True
- def get_url(self):
- "Get repository URL"
- urlre = re.compile(r'url="([^"]+)"')
- return urlre.search(self.data).group(1)
-
def parse_revision_numbers(self):
revre = re.compile(r'committed-rev="(\d+)"')
return [
@@ -295,13 +287,6 @@ class SVNEntriesCMD(SVNEntries): - def get_url(self):
- "Get repository URL"
- url_element = self.get_dir_data().getElementsByTagName("url")[0]
- url_text = [t.nodeValue for t in url_element.childNodes
- if t.nodeType == t.TEXT_NODE]
- return "".join(url_text)
-
def __get_cached_revision(self):
return self.revision
|