Skip to content

Commit 6a21daf

Browse files
committed
Rename to timezone instead of zone
1 parent bc3f7b1 commit 6a21daf

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

Diff for: arrow/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from ._version import __version__
2-
from .api import get, now, utcnow, zone
2+
from .api import get, now, timezone, utcnow
33
from .arrow import Arrow
44
from .factory import ArrowFactory
55
from .formatter import (
@@ -23,7 +23,7 @@
2323
"get",
2424
"now",
2525
"utcnow",
26-
"zone",
26+
"timezone",
2727
"Arrow",
2828
"ArrowFactory",
2929
"FORMAT_ATOM",

Diff for: arrow/api.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
from time import struct_time
1010
from typing import Any, List, Optional, Tuple, Type, Union, overload
1111

12-
from dateutil import tz as dateutil_tz
13-
1412
from arrow.arrow import TZ_EXPR, Arrow
1513
from arrow.constants import DEFAULT_LOCALE
1614
from arrow.factory import ArrowFactory
@@ -114,8 +112,8 @@ def now(tz: Optional[TZ_EXPR] = None) -> Arrow:
114112
now.__doc__ = _factory.now.__doc__
115113

116114

117-
def zone(zone_name: str) -> dateutil_tz:
118-
return _factory.zone(zone_name)
115+
def timezone(zone_name: str) -> dt_tzinfo:
116+
return _factory.timezone(zone_name)
119117

120118

121119
def factory(type: Type[Arrow]) -> ArrowFactory:
@@ -129,4 +127,4 @@ def factory(type: Type[Arrow]) -> ArrowFactory:
129127
return ArrowFactory(type)
130128

131129

132-
__all__ = ["get", "utcnow", "now", "factory", "zone"]
130+
__all__ = ["get", "utcnow", "now", "factory", "timezone"]

Diff for: arrow/factory.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def now(self, tz: Optional[TZ_EXPR] = None) -> Arrow:
348348
return self.type.now(tz)
349349

350350
@staticmethod
351-
def zone(zone_name: str) -> dateutil_tz:
351+
def timezone(zone_name: str) -> dt_tzinfo:
352352
"""docstring here"""
353353
zone = parser.TzinfoParser.parse(zone_name)
354354

Diff for: tests/test_factory.py

+12
Original file line numberDiff line numberDiff line change
@@ -434,3 +434,15 @@ def test_tzinfo(self):
434434
def test_tz_str(self):
435435

436436
assert_datetime_equality(self.factory.now("EST"), datetime.now(tz.gettz("EST")))
437+
438+
439+
@pytest.mark.usefixtures("arrow_factory")
440+
class TestTimezone:
441+
def test_timezone(self):
442+
443+
assert self.factory.timezone("Australia/Darwin") == tz.gettz("Australia/Darwin")
444+
445+
def test_bad_input(self):
446+
447+
with pytest.raises(ParserError):
448+
self.factory.timezone("absolute garbage#!?")

0 commit comments

Comments
 (0)