8000 Implement most common sys.version_info and sys.platform checks by gvanrossum · Pull Request #1942 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Implement most common sys.version_info and sys.platform checks #1942

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 9 commits into from
Jul 27, 2016
Merged

Implement most common sys.version_info and sys.platform checks #1942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3cbf1b4
Add sys.version_info checks. With some basic tests.
Jul 26, 2016
cea303b
Add tests for negated sys.version checks, and fix the code.
Jul 26, 2016
8816915
More tests for sys.version_info[<slice>]. Found no new bugs (except i…
Jul 26, 2016
4e84874
Add more slicing tests. Fixed a bug one of these found.
Jul 26, 2016
d28d75b
Add sys.platform support (no test yet).
Jul 26, 2016
c70a97d
Add tests for sys.platform. Fix type error. Change rules for sys.vers…
Jul 26, 2016
5eaae5a
Be more careful with win32 platform in crawl.py.
Jul 26, 2016
70bcaea
Add TODOs in response to code review.
Jul 27, 2016
65cf9ac
Add more tests for sys.version_info/platform.
Jul 27, 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
Prev Previous commit
Next Next commit
Add more slicing tests. Fixed a bug one of these found.
  • Loading branch information
Guido van Rossum committed Jul 27, 2016
commit 4e8487466b545964f6a5a0188de0dedecbbcfbac
28 changes: 13 additions & 15 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2832,16 +2832,16 @@ def consider_sys_version_info(expr: Node, pyversion: Tuple[int, ...]) -> int:
else:
return TRUTH_VALUE_UNKNOWN
elif isinstance(index, tuple) and isinstance(thing, tuple):
lo, hi = cast(Tuple[Optional[int], Optional[int]], index)
# Why doesn't mypy see that index can't be None here?
lo, hi = cast(tuple, index)
if lo is None:
lo = 0
if hi is None:
hi = 2
if 0 <= lo <= 2:
if 0 <= hi <= 2:
val = pyversion[lo:hi]
if len(val) == len(thing) or op not in ('==', '!='):
return fixed_comparison(val, op, thing)
if 0 <= lo < hi <= 2:
val = pyversion[lo:hi]
if len(val) == len(thing) or op not in ('==', '!='):
return fixed_comparison(val, op, thing)
return TRUTH_VALUE_UNKNOWN


Expand All @@ -2864,19 +2864,17 @@ def fixed_comparison(left: Targ, op: str, right: Targ) -> int:
return TRUTH_VALUE_UNKNOWN


def contains_int_or_tuple_of_ints(expr: Node) -> Union[None, int, Tuple[int], Tuple[int, int]]:
def contains_int_or_tuple_of_ints(expr: Node) -> Union[None, int, Tuple[int], Tuple[int, ...]]:
if isinstance(expr, IntExpr):
return expr.value
if isinstance(expr, TupleExpr):
if expr.literal == LITERAL_YES:
if len(expr.items) == 1:
e = expr.items[0]
if isinstance(e, IntExpr):
return (e.value,)
elif len(expr.items) == 2:
e0, e1 = expr.items[0], expr.items[1]
if isinstance(e0, IntExpr) and isinstance(e1, IntExpr):
return (e0.value, e1.value)
thing = []
for x in expr.items:
if not isinstance(x, IntExpr):
return None
thing.append(x.value)
return tuple(thing)
return None


Expand Down
28 changes: 28 additions & 0 deletions test-data/unit/check-unreachable-code.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,31 @@ else:
foo() + 0
[builtins fixtures/ops.py]
[out]

[case testSysVersionInfoSliced7]
import sys
if sys.version_info >= (3, 5):
def foo() -> int: return 0
else:
def foo() -> str: return ''
foo() + 0
[builtins fixtures/ops.py]
[out]

[case testSysVersionInfoSliced8]
import sys
if sys.version_info >= (3, 5, 0):
def foo() -> int: return 0
else:
def foo() -> str: return ''
[builtins fixtures/ops.py]
[out]

[case testSysVersionInfoSliced9]
import sys
if sys.version_info[1:] >= (5, 0):
def foo() -> int: return 0
else:
def foo() -> str: return ''
[builtins fixtures/ops.py]
[out]
0