8000 Update type hints to python3 style (non-array files) by gwrome · Pull Request #25802 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Update type hints to python3 style (non-array files) #25802

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 16 commits into from
Mar 30, 2019
Merged

Update type hints to python3 style (non-array files) #25802

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aa19aa4
#25790 Updated type hints to Python3 style in files outside core/arrays/
gwrome Mar 20, 2019
014c48e
#25790 Added TypeVar to hint in core/indexes/base.py
gwrome Mar 20, 2019
5e991b6
Fixed reference to types.Tuple that should have been to typing.Tuple
gwrome Mar 20, 2019
0efb21d
Fixed import sort
gwrome Mar 20, 2019
d2a542b
Replaced TypeVars with forward references
gwrome Mar 20, 2019
1341a1e
Made changes requested by @WillAyd
gwrome Mar 20, 2019
1e6e679
Removed class and instance variable type hints for 3.5 compatibility
gwrome Mar 21, 2019
13fc9ca
Requested changes
gwrome Mar 22, 2019
3c07c5e
Fixed type Optional[] hint
gwrome Mar 22, 2019
c774e4a
Updates to correct errors revealed by mypy
gwrome Mar 22, 2019
a5fd652
Revert "Updates to correct errors revealed by mypy"
gwrome Mar 24, 2019
dcabf97
Fix line formatting
gwrome Mar 24, 2019
75ba127
Replace forward references with ABCs
gwrome Mar 25, 2019
76f259e
Merge branch 'master' into update-type-hints-python3
gwrome Mar 26, 2019
70fe87e
8000 type to Type
gwrome Mar 27, 2019
ce92ce8
Trigger tests again
gwrome Mar 27, 2019
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
Prev Previous commit
Next Next commit
Replace forward references with ABCs
  • Loading branch information
@gwrome
gwrome committed Mar 25, 2019
commit 75ba127b60f4edf3703d22dd06c188843b8184c4
7 changes: 4 additions & 3 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
is_iterator,
is_sequence,
is_named_tuple)
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCMultiIndex
from pandas.core.dtypes.generic import (
ABCSeries, ABCDataFrame, ABCIndexClass, ABCMultiIndex)
from pandas.core.dtypes.missing import isna, notna

from pandas.core import algorithms
Expand Down Expand Up @@ -6246,8 +6247,8 @@ def diff(self, periods=1, axis=0):
def _gotitem(self,
key: Union[str, List[str]],
ndim: int,
subset: Optional[Union[Series, 'DataFrame']] = None,
) -> Union[Series, 'DataFrame']:
subset: Optional[Union[Series, ABCDataFrame]] = None,
) -> Union[Series, ABCDataFrame]:
"""
Sub-classes to define. Return a sliced object.

Expand Down
2 changes: 1 addition & 1 deletion pandas/core/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3632,7 +3632,7 @@ def values(self):
return self._data.view(np.ndarray)

@property
def _values(self) -> Union[ExtensionArray, 'Index', np.ndarray]:
def _values(self) -> Union[ExtensionArray, ABCIndexClass, np.ndarray]:
# TODO(EA): remove index types as they become extension arrays
"""
The best array representation.
Expand Down
0