diff options
| author | philip_thiem <ptthiem+bitbuket@gmail.com> | 2013-11-07 21:43:41 -0600 |
|---|---|---|
| committer | philip_thiem <ptthiem+bitbuket@gmail.com> | 2013-11-07 21:43:41 -0600 |
| commit | ba9d35158fe8f4af6a2b19e84a2eaca718a93e03 (patch) | |
| tree | 933332e33bb0a9b9d9605f22faa6860c44bcb5b1 /setuptools | |
| parent | d0526b9ca5baad5b23180d32cf8b387bfcea0eaa (diff) | |
| parent | 52e317a70799cceedb959be2206ec5985d9c280d (diff) | |
| download | python-setuptools-git-ba9d35158fe8f4af6a2b19e84a2eaca718a93e03.tar.gz | |
Merged pypa/setuptools into default
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/tests/svn17_example.zip | bin | 19342 -> 0 bytes | |||
| -rw-r--r-- | setuptools/tests/test_svn.py | 20 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/setuptools/tests/svn17_example.zip b/setuptools/tests/svn17_example.zip Binary files differdeleted file mode 100644 index cfabd2b2..00000000 --- a/setuptools/tests/svn17_example.zip +++ /dev/null diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py index cf98141a..5418b9a4 100644 --- a/setuptools/tests/test_svn.py +++ b/setuptools/tests/test_svn.py @@ -3,7 +3,6 @@ import os -import sys import unittest import codecs from setuptools.tests import environment @@ -11,12 +10,6 @@ from setuptools.compat import unicode, unichr from setuptools import svn_utils -#requires python >= 2.4 -from subprocess import call as _call - -from distutils import log - - class TestSvnVersion(unittest.TestCase): @@ -63,13 +56,6 @@ class ParserInfoXML(unittest.TestCase): data = _read_utf8_file(path) - if ext_spaces: - folder2 = 'third party2' - folder3 = 'third party3' - else: - folder2 = 'third_party2' - folder3 = 'third_party3' - expected = set([ ("\\".join((example_base, 'a file')), 'file'), ("\\".join((example_base, 'folder')), 'dir'), @@ -115,7 +101,7 @@ class ParserExternalXML(unittest.TestCase): expected = set([ os.sep.join((example_base, folder2)), os.sep.join((example_base, folder3)), - #third_party大介 + # folder is third_party大介 os.sep.join((example_base, unicode('third_party') + unichr(0x5927) + unichr(0x4ecb))), @@ -128,7 +114,7 @@ class ParserExternalXML(unittest.TestCase): expected = set(os.path.normpath(x) for x in expected) dir_base = os.sep.join(('C:', 'development', 'svn_example')) - self.assertEqual(set(x for x \ + self.assertEqual(set(x for x in svn_utils.parse_externals_xml(data, dir_base)), expected) def test_svn15(self): @@ -149,7 +135,6 @@ class ParseExternal(unittest.TestCase): def parse_tester(self, svn_name, ext_spaces): path = os.path.join('setuptools', 'tests', 'svn_data', svn_name + '_ext_list.txt') - example_base = svn_name + '_example' data = _read_utf8_file(path) if ext_spaces: @@ -236,4 +221,3 @@ class TestSvn(environment.ZippedEnvironment): def test_suite(): return unittest.defaultTestLoader.loadTestsFromName(__name__) - diff --git a/setuptools/version.py b/setuptools/version.py index 0f663085..e3983324 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '1.4' +__version__ = '1.3.2' |