Merge with default

7 files changed, 55 insertions, 49 deletions

diff --git a/.hgtags b/.hgtags
index bd3b7d36..db97710c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -100,3 +100,4 @@ ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
 f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
 d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
 5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
+cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
diff --git a/CHANGES.txt b/CHANGES.txt
index f97dca3c..b97c1004 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ CHANGES
   launcher for 'develop' installs).
 * ``ez_setup.py`` now ensures partial downloads are cleaned up following
   a failed download.
+* Distribute #363 and Issue #55: Skip an sdist test that fails on locales
+  other than UTF-8.
 
 -----
 1.1.6
diff --git a/ez_setup.py b/ez_setup.py
index c3069e7a..a46b9005 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.7"
+DEFAULT_VERSION = "1.1.8"
 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 4a09dd1c..a5f253ce 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-use_2to3_fixers = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.commands]
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 rotate = setuptools.command.rotate:rotate
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_scripts = setuptools.command.install_scripts:install_scripts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
 build_ext = setuptools.command.build_ext:build_ext
-install = setuptools.command.install:install
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-saveopts = setuptools.command.saveopts:saveopts
+install_lib = setuptools.command.install_lib:install_lib
 develop = setuptools.command.develop:develop
+saveopts = setuptools.command.saveopts:saveopts
+build_py = setuptools.command.build_py:build_py
+upload_docs = setuptools.command.upload_docs:upload_docs
+egg_info = setuptools.command.egg_info:egg_info
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+sdist = setuptools.command.sdist:sdist
 alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
 register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
 test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-install_lib = setuptools.command.install_lib:install_lib
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+setopt = setuptools.command.setopt:setopt
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+[distutils.setup_keywords]
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+convert_2to3_doctests = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c97..7a47af1d 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 8d6aff19..65a9f0b3 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-
+import locale
 import os
 import shutil
 import sys
@@ -11,6 +11,7 @@ import unicodedata
 from setuptools.tests import environment
 
 from setuptools.compat import StringIO, unicode
+from setuptools.tests.py26compat import skipIf
 from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -320,6 +321,8 @@ class TestSdistTest(unittest.TestCase):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
+    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
+            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
diff --git a/setuptools/version.py b/setuptools/version.py
index 9910ac22..f0be1393 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.7'
+__version__ = '1.1.8'