Passes the LANG env var from tox to the tests

Kevin McDonald · Kevin McDonald · commit 29a1ee9fef73 · 2015-06-01T11:25:37.000-05:00
diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py
@@ -34,22 +34,6 @@
 if sys.stdout.isatty():
     DEFAULT_FORMAT = 'table'
 
-# Attempt to set the locale for the user if the default encoding is
-# ascii. More information here:
-# http://click.pocoo.org/4/python3/#python-3-surrogate-handling
-import codecs
-import locale
-try:
-    ENC = codecs.lookup(locale.getpreferredencoding()).name
-except Exception:
-    ENC = 'ascii'
-
-if ENC == 'ascii':
-    try:
-        locale.setlocale(locale.LC_ALL, 'C.UTF-8')
-    except Exception:
-        pass
-
 
 class CommandLoader(click.MultiCommand):
     """Loads module for click."""
@@ -192,6 +176,7 @@ def output_result(ctx, result, timings=False, **kwargs):
 def main():
     """Main program. Catches several common errors and displays them nicely."""
     exit_status = 0
+
     try:
         cli.main()
     except SoftLayer.SoftLayerAPIError as ex:
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,10 @@
 [tox]
 envlist = py26,py27,py33,py34,pypy,analysis,coverage
+
 [testenv]
+setenv =
+    LANG = {env:LANG:C.UTF-8}
+
 deps = -r{toxinidir}/tools/test-requirements.txt
 commands = nosetests
 
