Fix type annotation in pandas.compat #26252
Conversation
| @@ -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 | |||
There was a problem hiding this comment.
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
pandas/compat/__init__.py
Outdated
| if PY36: | ||
| import typing | ||
| re_type = typing.re.Pattern | ||
| from typing import Pattern, Type |
There was a problem hiding this comment.
do these exist in 3.5? can u move this import to the top?
There was a problem hiding this comment.
I tested the imports locally in 3.5.7, and they worked, so moving them shouldn't present a problem.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Codecov Report
@@ Coverage Diff @@
## master #26252 +/- ##
==========================================
- Coverage 91.98% 91.97% -0.01%
==========================================
Files 175 175
Lines 52384 52384
==========================================
- Hits 48184 48179 -5
- Misses 4200 4205 +5
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #26252 +/- ##
==========================================
- Coverage 91.98% 91.97% -0.01%
==========================================
Files 175 175
Lines 52384 52383 -1
==========================================
- Hits 48184 48179 -5
- Misses 4200 4204 +4
Continue to review full report at Codecov.
|
|
thanks! |
git diff upstream/master -u -- "*.py" | flake8 --diff