Skip to content

Fix type annotation in pandas.compat #26252

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
May 1, 2019
Merged

Fix type annotation in pandas.compat #26252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbcee29
Fix type annotation in pandas.compat
gwrome Apr 30, 2019
f1ec34c
Remove PY36 condition for regex type
gwrome May 1, 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
3 changes: 0 additions & 3 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ follow_imports=silent
[mypy-pandas.conftest,pandas.tests.*]
ignore_errors=True

[mypy-pandas.compat]
ignore_errors=True

[mypy-pandas.core.api]
ignore_errors=True

Expand Down
6 changes: 2 additions & 4 deletions pandas/compat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,9 @@ def raise_with_traceback(exc, traceback=Ellipsis):
raise exc.with_traceback(traceback)


# In Python 3.7, the private re._pattern_type is removed.
# Python 3.5+ have typing.re.Pattern
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed these comments because they're misleading. typing.re.Pattern is available in 3.5-3.7. It's been removed from the documentation as of 3.6, but it continues to be available. As of 3.6, the documented method is to use typing.Pattern, which also works in 3.5. I've adopted that pattern in this PR, which corrected the mypy error

if PY36:
import typing
re_type = typing.re.Pattern
from typing import Pattern, Type
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do these exist in 3.5? can u move this import to the top?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested the imports locally in 3.5.7, and they worked, so moving them shouldn't present a problem.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Type I think is from 3.5.2. We've used elsewhere so need to address at some point. Maybe vendoring, either dropping < 3.5.2 or vendoring that piece

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignoring my previous comment for a second would we even need the Py36 condition or can we import all from the same space across versions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've successfully tested from typing import Pattern, Type in 3.5.7, 3.6.8, and 3.7.3. I can't speak for anything before 3.5.7, but there's no problem importing after the most recent 3.5 micro version. I'll move the imports to the top and drop the else.

re_type = Pattern # type: Type[Pattern]
else:
re_type = type(re.compile(''))

Expand Down