[pyupgrade]: Remove outdated sys.version_info blocks

Cargo.toml

@@ -77,7 +77,7 @@ wasm-bindgen = { version = "0.2.83" }
 is_executable = "1.0.1"
 
 [dev-dependencies]
-insta = { version = "1.19.1", features = ["yaml", "redactions"] }
+insta = { version = "1.19.0", features = ["yaml", "redactions"] }
 test-case = { version = "2.2.2" }
 wasm-bindgen-test = { version = "0.3.33" }
 

README.md

@@ -849,6 +849,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/) on PyPI.
 | UP033 | functools-cache | Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` | 🛠 |
 | UP034 | extraneous-parentheses | Avoid extraneous parentheses | 🛠 |
 | UP035 | import-replacements | Import from `{module}` instead: {names} | 🛠 |
+| UP036 | outdated-version-block | Version block is outdated for minimum Python version | 🛠 |
 
 ### flake8-2020 (YTT)
 

foo.py

@@ -0,0 +1,4 @@
+import sys
+
+expected_error = \
+    []

resources/test/fixtures/pyupgrade/UP036_0.py

@@ -0,0 +1,180 @@
+import sys
+
+if sys.version_info < (3,0):
+    print("py2")
+else:
+    print("py3")
+
+if sys.version_info < (3,0):
+    if True:
+        print("py2!")
+    else:
+        print("???")
+else:
+    print("py3")
+
+if sys.version_info < (3,0): print("PY2!")
+else: print("PY3!")
+
+if True:
+    if sys.version_info < (3,0):
+        print("PY2")
+    else:
+        print("PY3")
+
+if sys.version_info < (3,0): print(1 if True else 3)
+else:
+    print("py3")
+
+if sys.version_info < (3,0):
+    def f():
+        print("py2")
+else:
+    def f():
+        print("py3")
+        print("This the next")
+
+if sys.version_info > (3,0):
+    print("py3")
+else:
+    print("py2")
+
+
+x = 1
+
+if sys.version_info > (3,0):
+    print("py3")
+else:
+    print("py2")
+    # ohai
+
+x = 1
+
+if sys.version_info > (3,0): print("py3")
+else: print("py2")
+
+if sys.version_info > (3,):
+    print("py3")
+else:
+    print("py2")
+
+if True:
+    if sys.version_info > (3,):
+        print("py3")
+    else:
+        print("py2")
+
+if sys.version_info < (3,):
+    print("py2")
+else:
+    print("py3")
+
+def f():
+    if sys.version_info < (3,0):
+        try:
+            yield
+        finally:
+            pass
+    else:
+        yield
+
+
+class C:
+    def g():
+        pass
+
+    if sys.version_info < (3,0):
+        def f(py2):
+            pass
+    else:
+        def f(py3):
+            pass
+
+    def h():
+        pass
+
+if True:
+    if sys.version_info < (3,0):
+        2
+    else:
+        3
+
+    # comment
+
+if sys.version_info < (3,0):
+    def f():
+        print("py2")
+    def g():
+        print("py2")
+else:
+    def f():
+        print("py3")
+    def g():
+        print("py3")
+
+if True:
+    if sys.version_info > (3,):
+        print(3)
+    # comment
+    print(2+3)
+
+if True:
+    if sys.version_info > (3,): print(3)
+
+if True:
+    if sys.version_info > (3,):
+        print(3)
+
+
+if True:
+    if sys.version_info <= (3, 0):
+        expected_error = []
+    else:
+        expected_error = [
+"<stdin>:1:5: Generator expression must be parenthesized",
+"max(1 for i in range(10), key=lambda x: x+1)",
+"    ^",
+        ]
+
+
+if sys.version_info <= (3, 0):
+    expected_error = []
+else:
+    expected_error = [
+"<stdin>:1:5: Generator expression must be parenthesized",
+"max(1 for i in range(10), key=lambda x: x+1)",
+"    ^",
+    ]
+
+
+if sys.version_info > (3,0):
+    """this
+is valid"""
+
+    """the indentation on
+    this line is significant"""
+
+    "this is" \
+    "allowed too"
+
+    ("so is"
+     "this for some reason")
+
+if sys.version_info > (3, 0): expected_error = \
+    []
+
+if sys.version_info > (3, 0): expected_error = []
+
+if sys.version_info > (3, 0): \
+    expected_error = []
+
+if True:
+    if sys.version_info > (3, 0): expected_error = \
+    []
+
+if True:
+    if sys.version_info > (3, 0): expected_error = []
+
+if True:
+    if sys.version_info > (3, 0): \
+    expected_error = []

resources/test/fixtures/pyupgrade/UP036_1.py

@@ -0,0 +1,76 @@
+import sys
+
+if sys.version_info == 2:
+    2
+else:
+    3
+
+if sys.version_info < (3,):
+    2
+else:
+    3
+
+if sys.version_info < (3,0):
+    2
+else:
+    3
+
+if sys.version_info == 3:
+    3
+else:
+    2
+
+if sys.version_info > (3,):
+    3
+else:
+    2
+
+if sys.version_info >= (3,):
+    3
+else:
+    2
+
+from sys import version_info
+
+if version_info > (3,):
+    3
+else:
+    2
+
+if True:
+    print(1)
+elif sys.version_info < (3,0):
+    print(2)
+else:
+    print(3)
+
+if True:
+    print(1)
+elif sys.version_info > (3,):
+    print(3)
+else:
+    print(2)
+
+if True:
+    print(1)
+elif sys.version_info > (3,):
+    print(3)
+
+def f():
+    if True:
+        print(1)
+    elif sys.version_info > (3,):
+        print(3)
+
+if True:
+    print(1)
+elif sys.version_info < (3,0):
+    print(2)
+else:
+    print(3)
+
+def f():
+    if True:
+        print(1)
+    elif sys.version_info > (3,):
+        print(3)

resources/test/fixtures/pyupgrade/UP036_2.py

@@ -0,0 +1,62 @@
+import sys
+from sys import version_info
+
+if sys.version_info > (3, 5):
+    3+6
+else:
+    3-5
+
+if version_info > (3, 5):
+    3+6
+else:
+    3-5
+
+if sys.version_info >= (3,6):
+    3+6
+else:
+    3-5
+
+if version_info >= (3,6):
+    3+6
+else:
+    3-5
+
+if sys.version_info < (3,6):
+    3-5
+else:
+    3+6
+
+if sys.version_info <= (3,5):
+    3-5
+else:
+    3+6
+
+if sys.version_info <= (3, 5):
+    3-5
+else:
+    3+6
+
+if sys.version_info >= (3, 5):
+    pass
+
+if sys.version_info < (3,0):
+    pass
+
+if True:
+    if sys.version_info < (3,0):
+        pass
+
+if sys.version_info < (3,0):
+    pass
+elif False:
+    pass
+
+if sys.version_info > (3,):
+    pass
+elif False:
+    pass
+
+if sys.version_info[0] > "2":
+    3
+else:
+    2

resources/test/fixtures/pyupgrade/UP036_3.py

@@ -0,0 +1,24 @@
+import sys
+
+if            sys.version_info < (3,0):
+    print("py2")
+    for item in range(10):
+        print(f"PY2-{item}")
+else                                :
+    print("py3")
+    for item in range(10):
+        print(f"PY3-{item}")
+
+if False:
+    if            sys.version_info < (3,0):
+        print("py2")
+        for item in range(10):
+            print(f"PY2-{item}")
+    else                                :
+        print("py3")
+        for item in range(10):
+            print(f"PY3-{item}")
+
+
+if            sys.version_info < (3,0): print("PY2!")
+else                               : print("PY3!")