Skip to content

Commit 4e1ef26

Browse files
committed
rename case-->tzstr
1 parent 3454a3c commit 4e1ef26

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

pandas/tests/scalar/period/test_period.py

+24-24
Original file line numberDiff line numberDiff line change
@@ -212,58 +212,58 @@ def test_period_cons_combined(self):
212212
with tm.assert_raises_regex(ValueError, msg):
213213
Period('2011-01', freq='1D1W')
214214

215-
@pytest.mark.parametrize('case', ['Europe/Brussels',
216-
'Asia/Tokyo', 'US/Pacific'])
217-
def test_timestamp_tz_arg(self, case):
218-
p = Period('1/1/2005', freq='M').to_timestamp(tz=case)
219-
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
220-
exp_zone = pytz.timezone(case).normalize(p)
215+
@pytest.mark.parametrize('tzstr', ['Europe/Brussels',
216+
'Asia/Tokyo', 'US/Pacific'])
217+
def test_timestamp_tz_arg(self, tzstr):
218+
p = Period('1/1/2005', freq='M').to_timestamp(tz=tzstr)
219+
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(tzstr)
220+
exp_zone = pytz.timezone(tzstr).normalize(p)
221221

222222
assert p == exp
223223
assert p.tz == exp_zone.tzinfo
224224
assert p.tz == exp.tz
225225

226-
p = Period('1/1/2005', freq='3H').to_timestamp(tz=case)
227-
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
228-
exp_zone = pytz.timezone(case).normalize(p)
226+
p = Period('1/1/2005', freq='3H').to_timestamp(tz=tzstr)
227+
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(tzstr)
228+
exp_zone = pytz.timezone(tzstr).normalize(p)
229229

230230
assert p == exp
231231
assert p.tz == exp_zone.tzinfo
232232
assert p.tz == exp.tz
233233

234-
p = Period('1/1/2005', freq='A').to_timestamp(freq='A', tz=case)
235-
exp = Timestamp('31/12/2005', tz='UTC').tz_convert(case)
236-
exp_zone = pytz.timezone(case).normalize(p)
234+
p = Period('1/1/2005', freq='A').to_timestamp(freq='A', tz=tzstr)
235+
exp = Timestamp('31/12/2005', tz='UTC').tz_convert(tzstr)
236+
exp_zone = pytz.timezone(tzstr).normalize(p)
237237

238238
assert p == exp
239239
assert p.tz == exp_zone.tzinfo
240240
assert p.tz == exp.tz
241241

242-
p = Period('1/1/2005', freq='A').to_timestamp(freq='3H', tz=case)
243-
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
244-
exp_zone = pytz.timezone(case).normalize(p)
242+
p = Period('1/1/2005', freq='A').to_timestamp(freq='3H', tz=tzstr)
243+
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(tzstr)
244+
exp_zone = pytz.timezone(tzstr).normalize(p)
245245

246246
assert p == exp
247247
assert p.tz == exp_zone.tzinfo
248248
assert p.tz == exp.tz
249249

250-
@pytest.mark.parametrize('case', ['dateutil/Europe/Brussels',
251-
'dateutil/Asia/Tokyo',
252-
'dateutil/US/Pacific'])
253-
def test_timestamp_tz_arg_dateutil(self, case):
250+
@pytest.mark.parametrize('tzstr', ['dateutil/Europe/Brussels',
251+
'dateutil/Asia/Tokyo',
252+
'dateutil/US/Pacific'])
253+
def test_timestamp_tz_arg_dateutil(self, tzstr):
254254
from pandas._libs.tslibs.timezones import dateutil_gettz
255255
from pandas._libs.tslibs.timezones import maybe_get_tz
256-
tz = maybe_get_tz(case)
256+
tz = maybe_get_tz(tzstr)
257257
p = Period('1/1/2005', freq='M').to_timestamp(tz=tz)
258-
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
258+
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(tzstr)
259259
assert p == exp
260-
assert p.tz == dateutil_gettz(case.split('/', 1)[1])
260+
assert p.tz == dateutil_gettz(tzstr.split('/', 1)[1])
261261
assert p.tz == exp.tz
262262

263263
p = Period('1/1/2005', freq='M').to_timestamp(freq='3H', tz=tz)
264-
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
264+
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(tzstr)
265265
assert p == exp
266-
assert p.tz == dateutil_gettz(case.split('/', 1)[1])
266+
assert p.tz == dateutil_gettz(tzstr.split('/', 1)[1])
267267
assert p.tz == exp.tz
268268

269269
def test_timestamp_tz_arg_dateutil_from_string(self):

0 commit comments

Comments
 (0)