|
13 | 13 |
|
14 | 14 | import pandas.util.testing as tm
|
15 | 15 | import pandas.tseries.offsets as offsets
|
16 |
| -from pandas.compat import lrange, zip |
| 16 | +from pandas.compat import lrange, zip, PY3 |
17 | 17 | from pandas.core.indexes.datetimes import bdate_range, date_range
|
18 | 18 | from pandas.core.dtypes.dtypes import DatetimeTZDtype
|
19 | 19 | from pandas._libs import tslib
|
@@ -1278,16 +1278,22 @@ def test_replace_tzinfo(self):
|
1278 | 1278 | result_dt = dt.replace(tzinfo=tzinfo)
|
1279 | 1279 | result_pd = Timestamp(dt).replace(tzinfo=tzinfo)
|
1280 | 1280 |
|
1281 |
| - if hasattr(result_dt, 'timestamp'): # New method in Py 3.3 |
1282 |
| - assert result_dt.timestamp() == result_pd.timestamp() |
| 1281 | + if PY3: |
| 1282 | + # datetime.timestamp() converts in the local timezone |
| 1283 | + with tm.set_timezone('UTC'): |
| 1284 | + assert result_dt.timestamp() == result_pd.timestamp() |
| 1285 | + |
1283 | 1286 | assert result_dt == result_pd
|
1284 | 1287 | assert result_dt == result_pd.to_pydatetime()
|
1285 | 1288 |
|
1286 | 1289 | result_dt = dt.replace(tzinfo=tzinfo).replace(tzinfo=None)
|
1287 | 1290 | result_pd = Timestamp(dt).replace(tzinfo=tzinfo).replace(tzinfo=None)
|
1288 | 1291 |
|
1289 |
| - if hasattr(result_dt, 'timestamp'): # New method in Py 3.3 |
1290 |
| - assert result_dt.timestamp() == result_pd.timestamp() |
| 1292 | + if PY3: |
| 1293 | + # datetime.timestamp() converts in the local timezone |
| 1294 | + with tm.set_timezone('UTC'): |
| 1295 | + assert result_dt.timestamp() == result_pd.timestamp() |
| 1296 | + |
1291 | 1297 | assert result_dt == result_pd
|
1292 | 1298 | assert result_dt == result_pd.to_pydatetime()
|
1293 | 1299 |
|
|
0 commit comments