Skip to content

Fixing timezone utc type #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2016
Merged

Fixing timezone utc type #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f23502
switching to timezone type
Sep 23, 2016
152bb2e
taking a shot at 2.7
Sep 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions stdlib/2.7/datetime.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ class tzinfo(object):
def dst(self, dt: Optional[datetime]) -> Optional[timedelta]: ...
def fromutc(self, dt: datetime) -> datetime: ...

class timezone(tzinfo):
utc = ... # type: tzinfo
min = ... # type: tzinfo
max = ... # type: tzinfo

def __init__(self, offset: timedelta, name: str = ...) -> None: ...
def __hash__(self) -> int: ...

_tzinfo = tzinfo
_timezone = timezone

class date(object):
min = ... # type: date
Expand Down Expand Up @@ -173,7 +164,7 @@ class datetime(object):
def tzinfo(self) -> _tzinfo: ...

@classmethod
def fromtimestamp(cls, t: float, tz: timezone = ...) -> datetime: ...
def fromtimestamp(cls, t: float, tz: _tzinfo = ...) -> datetime: ...
@classmethod
def utcfromtimestamp(cls, t: float) -> datetime: ...
@classmethod
Expand Down
6 changes: 3 additions & 3 deletions stdlib/3/datetime.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class tzinfo:
def fromutc(self, dt: datetime) -> datetime: ...

class timezone(tzinfo):
utc = ... # type: tzinfo
min = ... # type: tzinfo
max = ... # type: tzinfo
utc = ... # type: timezone
min = ... # type: timezone
max = ... # type: timezone

def __init__(self, offset: timedelta, name: str = ...) -> None: ...
def __hash__(self) -> int: ...
Expand Down