Remove compat code for Python < 3.7 (#1616)

Co-authored-by: Marcelo Trylesinski <marcelotryle@gmail.com>

diff --git a/setup.py b/setup.py
index e5447f981796f1239b5429497a381ecaa06bfe12..1597ef452a4b18e5ff35779a9cdc329d65812ab0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import os
 import re

diff --git a/starlette/routing.py b/starlette/routing.py
index 7b7dc9b749415ecc9b66a9e1281c065f660a0f9f..67f12e311109df15e448d816970a9b7bc67b701f 100644 (file)
--- a/starlette/routing.py
+++ b/starlette/routing.py
@@ -3,11 +3,11 @@ import contextlib
 import functools
 import inspect
 import re
-import sys
 import traceback
 import types
 import typing
 import warnings
+from contextlib import asynccontextmanager
 from enum import Enum
 
 from starlette.concurrency import run_in_threadpool
@@ -19,11 +19,6 @@ from starlette.responses import PlainTextResponse, RedirectResponse
 from starlette.types import ASGIApp, Receive, Scope, Send
 from starlette.websockets import WebSocket, WebSocketClose
 
-if sys.version_info >= (3, 7):
-    from contextlib import asynccontextmanager  # pragma: no cover
-else:
-    from contextlib2 import asynccontextmanager  # pragma: no cover
-
 
 class NoMatchFound(Exception):
     """

diff --git a/starlette/status.py b/starlette/status.py
index f350d448fec2f38f5bf4493659d751cf791bd1e8..1689328a4e204ff5b8f76e982187f769bba7f214 100644 (file)
--- a/starlette/status.py
+++ b/starlette/status.py
@@ -5,7 +5,6 @@ https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
 
 And RFC 2324 - https://tools.ietf.org/html/rfc2324
 """
-import sys
 import warnings
 from typing import List
 
@@ -187,11 +186,10 @@ def __getattr__(name: str) -> int:
     }
     deprecated = __deprecated__.get(name)
     if deprecated:
-        stacklevel = 3 if sys.version_info >= (3, 7) else 4
         warnings.warn(
             f"'{name}' is deprecated. Use '{deprecation_changes[name]}' instead.",
             category=DeprecationWarning,
-            stacklevel=stacklevel,
+            stacklevel=3,
         )
         return deprecated
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")

diff --git a/tests/test_applications.py b/tests/test_applications.py
index 62ddd7602fdf9d09f4a7813c345252064b69f99b..0d0ede571b2b86e8939e04200fd37b6f327f9eb0 100644 (file)
--- a/tests/test_applications.py
+++ b/tests/test_applications.py
@@ -1,5 +1,5 @@
 import os
-import sys
+from contextlib import asynccontextmanager
 
 import pytest
 
@@ -12,11 +12,6 @@ from starlette.responses import JSONResponse, PlainTextResponse
 from starlette.routing import Host, Mount, Route, Router, WebSocketRoute
 from starlette.staticfiles import StaticFiles
 
-if sys.version_info >= (3, 7):
-    from contextlib import asynccontextmanager  # pragma: no cover
-else:
-    from contextlib2 import asynccontextmanager  # pragma: no cover
-
 
 async def error_500(request, exc):
     return JSONResponse({"detail": "Server Error"}, status_code=500)

diff --git a/tests/test_testclient.py b/tests/test_testclient.py
index 22f0b3880824950922986d0d0e5827af74070d13..c9c7f33cace31081d9db1644c9be3e8524e972ef 100644 (file)
--- a/tests/test_testclient.py
+++ b/tests/test_testclient.py
@@ -1,6 +1,6 @@
-import asyncio
 import itertools
-import sys
+from asyncio import current_task as asyncio_current_task
+from contextlib import asynccontextmanager
 
 import anyio
 import pytest
@@ -13,13 +13,6 @@ from starlette.responses import JSONResponse
 from starlette.routing import Route
 from starlette.websockets import WebSocket, WebSocketDisconnect
 
-if sys.version_info >= (3, 7):  # pragma: no cover
-    from asyncio import current_task as asyncio_current_task
-    from contextlib import asynccontextmanager
-else:  # pragma: no cover
-    asyncio_current_task = asyncio.Task.current_task
-    from contextlib2 import asynccontextmanager
-
 
 def mock_service_endpoint(request):
     return JSONResponse({"mock": "example"})