|
1 | 1 | from __future__ import absolute_import
|
2 | 2 |
|
3 | 3 | import datetime as _datetime
|
4 |
| -from typing import Union, Optional |
5 | 4 |
|
6 |
| -from .__version__ import __version__ |
| 5 | +from typing import Optional |
| 6 | +from typing import Union |
7 | 7 |
|
8 |
| -# Types |
9 |
| -from .datetime import DateTime |
| 8 | +from .__version__ import __version__ |
| 9 | +from .constants import DAYS_PER_WEEK |
| 10 | +from .constants import FRIDAY |
| 11 | +from .constants import HOURS_PER_DAY |
| 12 | +from .constants import MINUTES_PER_HOUR |
| 13 | +from .constants import MONDAY |
| 14 | +from .constants import MONTHS_PER_YEAR |
| 15 | +from .constants import SATURDAY |
| 16 | +from .constants import SECONDS_PER_DAY |
| 17 | +from .constants import SECONDS_PER_HOUR |
| 18 | +from .constants import SECONDS_PER_MINUTE |
| 19 | +from .constants import SUNDAY |
| 20 | +from .constants import THURSDAY |
| 21 | +from .constants import TUESDAY |
| 22 | +from .constants import WEDNESDAY |
| 23 | +from .constants import WEEKS_PER_YEAR |
| 24 | +from .constants import YEARS_PER_CENTURY |
| 25 | +from .constants import YEARS_PER_DECADE |
10 | 26 | from .date import Date
|
11 |
| -from .time import Time |
| 27 | +from .datetime import DateTime |
12 | 28 | from .duration import Duration
|
| 29 | +from .formatting import Formatter |
| 30 | +from .helpers import format_diff |
| 31 | +from .helpers import get_locale |
| 32 | +from .helpers import get_test_now |
| 33 | +from .helpers import has_test_now |
| 34 | +from .helpers import locale |
| 35 | +from .helpers import set_locale |
| 36 | +from .helpers import set_test_now |
| 37 | +from .helpers import test |
| 38 | +from .helpers import week_ends_at |
| 39 | +from .helpers import week_starts_at |
| 40 | +from .parser import parse |
13 | 41 | from .period import Period
|
14 |
| - |
| 42 | +from .time import Time |
| 43 | +from .tz import POST_TRANSITION |
| 44 | +from .tz import PRE_TRANSITION |
| 45 | +from .tz import TRANSITION_ERROR |
| 46 | +from .tz import UTC |
| 47 | +from .tz import local_timezone |
| 48 | +from .tz import set_local_timezone |
| 49 | +from .tz import test_local_timezone |
15 | 50 | from .tz import timezone
|
16 |
| -from .tz import PRE_TRANSITION, POST_TRANSITION, TRANSITION_ERROR |
| 51 | +from .tz import timezones |
17 | 52 | from .tz.timezone import Timezone as _Timezone
|
18 |
| - |
19 |
| -from .formatting import Formatter |
20 |
| - |
21 |
| -# Helpers |
22 |
| -from .helpers import ( |
23 |
| - test, |
24 |
| - set_test_now, |
25 |
| - has_test_now, |
26 |
| - get_test_now, |
27 |
| - set_locale, |
28 |
| - get_locale, |
29 |
| - locale, |
30 |
| - format_diff, |
31 |
| - week_starts_at, |
32 |
| - week_ends_at, |
33 |
| -) |
34 |
| - |
35 | 53 | from .utils._compat import _HAS_FOLD
|
36 | 54 |
|
37 |
| -from .tz import timezones, local_timezone, test_local_timezone, set_local_timezone, UTC |
38 |
| - |
39 |
| -from .parser import parse |
40 |
| - |
41 |
| -# Constants |
42 |
| -from .constants import ( |
43 |
| - MONDAY, |
44 |
| - TUESDAY, |
45 |
| - WEDNESDAY, |
46 |
| - THURSDAY, |
47 |
| - FRIDAY, |
48 |
| - SATURDAY, |
49 |
| - SUNDAY, |
50 |
| - YEARS_PER_CENTURY, |
51 |
| - YEARS_PER_DECADE, |
52 |
| - MONTHS_PER_YEAR, |
53 |
| - WEEKS_PER_YEAR, |
54 |
| - DAYS_PER_WEEK, |
55 |
| - HOURS_PER_DAY, |
56 |
| - MINUTES_PER_HOUR, |
57 |
| - SECONDS_PER_MINUTE, |
58 |
| - SECONDS_PER_HOUR, |
59 |
| - SECONDS_PER_DAY, |
60 |
| -) |
61 | 55 |
|
62 | 56 | _TEST_NOW = None # type: Optional[DateTime]
|
63 | 57 | _LOCALE = "en"
|
@@ -245,11 +239,8 @@ def yesterday(tz="local"): # type: (Union[str, _Timezone]) -> DateTime
|
245 | 239 |
|
246 | 240 |
|
247 | 241 | def from_format(
|
248 |
| - string, # type: str |
249 |
| - fmt, # type: str |
250 |
| - tz=UTC, # type: Union[str, _Timezone] |
251 |
| - locale=None, # type: Optional[str] |
252 |
| -): # type: (...) -> DateTime |
| 242 | + string, fmt, tz=UTC, locale=None, # noqa |
| 243 | +): # type: (str, str, Union[str, _Timezone], Optional[str]) -> DateTime |
253 | 244 | """
|
254 | 245 | Creates a DateTime instance from a specific format.
|
255 | 246 | """
|
|
0 commit comments