Merged pypa/setuptools into default

6 files changed, 58 insertions, 51 deletions

diff --git a/.hgtags b/.hgtags
index c198d993..b0b1a807 100644
--- a/.hgtags
+++ b/.hgtags
@@ -105,3 +105,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 77921bbe3931caf40474dc36e55d3d541981c749 1.2
 19873119647deae8a68e9ed683317b9ee170a8d8 1.3
 a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
+076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
diff --git a/CHANGES.txt b/CHANGES.txt
index 11b8a502..7110e232 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,12 @@ CHANGES
 =======
 
 -----
+1.3.2
+-----
+
+* Issue #99: Fix filename encoding issues in SVN support.
+
+-----
 1.3.1
 -----
 
diff --git a/ez_setup.py b/ez_setup.py
index 4da59fcd..0057e275 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.3.2"
+DEFAULT_VERSION = "1.3.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 73498a4c..fb38112e 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.commands]
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 build_ext = setuptools.command.build_ext:build_ext
-egg_info = setuptools.command.egg_info:egg_info
 setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
+install_lib = setuptools.command.install_lib:install_lib
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-develop = setuptools.command.develop:develop
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+sdist = setuptools.command.sdist:sdist
+easy_install = setuptools.command.easy_install:easy_install
+upload_docs = setuptools.command.upload_docs:upload_docs
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-register = setuptools.command.register:register
 test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
-install_scripts = setuptools.command.install_scripts:install_scripts
-rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+alias = setuptools.command.alias:alias
 saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-alias = setuptools.command.alias:alias
-install_lib = setuptools.command.install_lib:install_lib
-easy_install = setuptools.command.easy_install:easy_install
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+build_py = setuptools.command.build_py:build_py
+rotate = setuptools.command.rotate:rotate
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.setup_keywords]
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 eager_resources = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
 install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-test_suite = setuptools.dist:check_test_suite
-packages = setuptools.dist:check_packages
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
+extras_require = setuptools.dist:check_extras
+test_loader = setuptools.dist:check_importable
 use_2to3 = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
 zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
 entry_points = setuptools.dist:check_entry_points
-include_package_data = setuptools.dist:assert_bool
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 5ff415da..221040f8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[certs]
-certifi==0.0.8
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[certs]
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index e3983324..07f744ca 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3.2'
+__version__ = '1.3.3'