aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2013-11-21 17:25:55 -0600
committerPhilip Thiem <ptthiem@gmail.com>2013-11-21 17:25:55 -0600
commit73c86d052de82327bdd0e22dd35de55f78d4186b (patch)
tree61fc0c1afaef8e8462cec3ec69f8a150437543cd
parent3f5053737eaf08ad854d40d23743f701d3bbdcc9 (diff)
downloadexternal_python_setuptools-73c86d052de82327bdd0e22dd35de55f78d4186b.tar.gz
external_python_setuptools-73c86d052de82327bdd0e22dd35de55f78d4186b.tar.bz2
external_python_setuptools-73c86d052de82327bdd0e22dd35de55f78d4186b.zip
forgot to add in the mac default.
-rw-r--r--setuptools/svn_utils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 93ddb292..e8570e52 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -91,9 +91,12 @@ def determine_console_encoding():
encoding = None
#olders pythons defaulted to this
+ is_osx = sys.platform == "darwin"
if not encoding:
- return "US-ASCII"
- elif encoding.startswith("mac-") and os.platform == "darwin":
+ return ["utf-8", "US-ASCII"][is_osx]
+ elif encoding.startswith("mac-") and is_osx:
+ #certain version of pythons would return mac-roman as default
+ #OSX as a left over of earlier mac versions.
return "utf-8"
else:
return encoding