|
2 | 2 |
|
3 | 3 | import copy |
4 | 4 | import json |
5 | | -from datetime import datetime, timezone |
| 5 | +from datetime import UTC, datetime |
6 | 6 |
|
7 | 7 | import pytest |
8 | 8 | from hdx.location.country import Country |
@@ -348,35 +348,35 @@ def test_get_set_date_of_dataset(self, configuration): |
348 | 348 | dataset = Dataset({"dataset_date": "[2020-01-07T00:00:00 TO *]"}) |
349 | 349 | result = dataset.get_time_period(today=datetime(2020, 11, 17)) |
350 | 350 | assert result == { |
351 | | - "startdate": datetime(2020, 1, 7, 0, 0, tzinfo=timezone.utc), |
352 | | - "enddate": datetime(2020, 11, 17, 23, 59, 59, tzinfo=timezone.utc), |
| 351 | + "startdate": datetime(2020, 1, 7, 0, 0, tzinfo=UTC), |
| 352 | + "enddate": datetime(2020, 11, 17, 23, 59, 59, tzinfo=UTC), |
353 | 353 | "startdate_str": "2020-01-07T00:00:00+00:00", |
354 | 354 | "enddate_str": "2020-11-17T23:59:59+00:00", |
355 | 355 | "ongoing": True, |
356 | 356 | } |
357 | 357 | dataset.set_time_period("2020-02-09") |
358 | 358 | result = dataset.get_time_period("%d/%m/%Y") |
359 | 359 | assert result == { |
360 | | - "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=timezone.utc), |
361 | | - "enddate": datetime(2020, 2, 9, 23, 59, 59, tzinfo=timezone.utc), |
| 360 | + "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=UTC), |
| 361 | + "enddate": datetime(2020, 2, 9, 23, 59, 59, tzinfo=UTC), |
362 | 362 | "startdate_str": "09/02/2020", |
363 | 363 | "enddate_str": "09/02/2020", |
364 | 364 | "ongoing": False, |
365 | 365 | } |
366 | 366 | dataset.set_time_period("2020-02-09", "2020-10-20") |
367 | 367 | result = dataset.get_time_period("%d/%m/%Y") |
368 | 368 | assert result == { |
369 | | - "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=timezone.utc), |
370 | | - "enddate": datetime(2020, 10, 20, 23, 59, 59, tzinfo=timezone.utc), |
| 369 | + "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=UTC), |
| 370 | + "enddate": datetime(2020, 10, 20, 23, 59, 59, tzinfo=UTC), |
371 | 371 | "startdate_str": "09/02/2020", |
372 | 372 | "enddate_str": "20/10/2020", |
373 | 373 | "ongoing": False, |
374 | 374 | } |
375 | 375 | dataset.set_time_period("2020-02-09", ongoing=True) |
376 | 376 | result = dataset.get_time_period("%d/%m/%Y", today=datetime(2020, 3, 9, 0, 0)) |
377 | 377 | assert result == { |
378 | | - "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=timezone.utc), |
379 | | - "enddate": datetime(2020, 3, 9, 23, 59, 59, tzinfo=timezone.utc), |
| 378 | + "startdate": datetime(2020, 2, 9, 0, 0, tzinfo=UTC), |
| 379 | + "enddate": datetime(2020, 3, 9, 23, 59, 59, tzinfo=UTC), |
380 | 380 | "startdate_str": "09/02/2020", |
381 | 381 | "enddate_str": "09/03/2020", |
382 | 382 | "ongoing": True, |
|
0 commit comments