Skip to content

Commit dadf73c

Browse files
committed
New tentative with C locale
1 parent b876296 commit dadf73c

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

.travis.yml

-12
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,8 @@ matrix:
160160
- JOB_TAG=_ASCII
161161
- NOSE_ARGS="not slow and not network and not disabled"
162162
- LOCALE_OVERRIDE="C"
163-
- FULL_DEPS=true
164-
- CLIPBOARD=xsel
165163
- CACHE_NAME="35_ascii"
166164
- USE_CACHE=true
167-
addons:
168-
apt:
169-
packages:
170-
- xsel
171165
# In allow_failures
172166
- python: 2.7
173167
env:
@@ -240,14 +234,8 @@ matrix:
240234
- JOB_TAG=_ASCII
241235
- NOSE_ARGS="not slow and not network and not disabled"
242236
- LOCALE_OVERRIDE="C"
243-
- FULL_DEPS=true
244-
- CLIPBOARD=xsel
245237
- CACHE_NAME="35_ascii"
246238
- USE_CACHE=true
247-
addons:
248-
apt:
249-
packages:
250-
- xsel
251239
- python: 2.7
252240
env:
253241
- JOB_NAME: "doc_build"

pandas/tools/tests/test_util.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ def test_set_locale(self):
6868
raise nose.SkipTest("Only a single locale found, no point in "
6969
"trying to test setting another locale")
7070

71-
if LOCALE_OVERRIDE is not None:
72-
lang, enc = LOCALE_OVERRIDE.split('.')
73-
else:
71+
if LOCALE_OVERRIDE is None:
7472
lang, enc = 'it_CH', 'UTF-8'
73+
elif LOCALE_OVERRIDE == 'C':
74+
lang, enc = 'en_US', 'ascii'
75+
else:
76+
lang, enc = LOCALE_OVERRIDE.split('.')
7577

7678
enc = codecs.lookup(enc).name
7779
new_locale = lang, enc

0 commit comments

Comments
 (0)