File tree 2 files changed +5
-15
lines changed
2 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -160,14 +160,8 @@ matrix:
160
160
- JOB_TAG=_ASCII
161
161
- NOSE_ARGS="not slow and not network and not disabled"
162
162
- LOCALE_OVERRIDE="C"
163
- - FULL_DEPS=true
164
- - CLIPBOARD=xsel
165
163
- CACHE_NAME="35_ascii"
166
164
- USE_CACHE=true
167
- addons :
168
- apt :
169
- packages :
170
- - xsel
171
165
# In allow_failures
172
166
- python : 2.7
173
167
env :
@@ -240,14 +234,8 @@ matrix:
240
234
- JOB_TAG=_ASCII
241
235
- NOSE_ARGS="not slow and not network and not disabled"
242
236
- LOCALE_OVERRIDE="C"
243
- - FULL_DEPS=true
244
- - CLIPBOARD=xsel
245
237
- CACHE_NAME="35_ascii"
246
238
- USE_CACHE=true
247
- addons :
248
- apt :
249
- packages :
250
- - xsel
251
239
- python : 2.7
252
240
env :
253
241
- JOB_NAME : " doc_build"
Original file line number Diff line number Diff line change @@ -68,10 +68,12 @@ def test_set_locale(self):
68
68
raise nose .SkipTest ("Only a single locale found, no point in "
69
69
"trying to test setting another locale" )
70
70
71
- if LOCALE_OVERRIDE is not None :
72
- lang , enc = LOCALE_OVERRIDE .split ('.' )
73
- else :
71
+ if LOCALE_OVERRIDE is None :
74
72
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 ('.' )
75
77
76
78
enc = codecs .lookup (enc ).name
77
79
new_locale = lang , enc
You can’t perform that action at this time.
0 commit comments