New tentative with C locale

pandas-dev · Sep 10, 2016 · dadf73c · dadf73c
1 parent b876296
commit dadf73c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -160,14 +160,8 @@ matrix:
         - JOB_TAG=_ASCII
         - NOSE_ARGS="not slow and not network and not disabled"
         - LOCALE_OVERRIDE="C"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - xsel
 #    In allow_failures
     - python: 2.7
       env:
@@ -240,14 +234,8 @@ matrix:
         - JOB_TAG=_ASCII
         - NOSE_ARGS="not slow and not network and not disabled"
         - LOCALE_OVERRIDE="C"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - xsel
       - python: 2.7
         env:
         - JOB_NAME: "doc_build"

diff --git a/pandas/tools/tests/test_util.py b/pandas/tools/tests/test_util.py
@@ -68,10 +68,12 @@ def test_set_locale(self):
             raise nose.SkipTest("Only a single locale found, no point in "
                                 "trying to test setting another locale")
 
-        if LOCALE_OVERRIDE is not None:
-            lang, enc = LOCALE_OVERRIDE.split('.')
-        else:
+        if LOCALE_OVERRIDE is None:
             lang, enc = 'it_CH', 'UTF-8'
+        elif LOCALE_OVERRIDE == 'C':
+            lang, enc = 'en_US', 'ascii'
+        else:
+            lang, enc = LOCALE_OVERRIDE.split('.')
 
         enc = codecs.lookup(enc).name
         new_locale = lang, enc