Convert type comments to annotations

Author: bluetech

pytest_django/asserts.py

@@ -26,7 +26,7 @@ def assertion_func(*args, **kwargs):
 
 
 __all__ = []
-assertions_names = set()  # type: Set[str]
+assertions_names: Set[str] = set()
 assertions_names.update(
     {attr for attr in vars(TestCase) if attr.startswith("assert")},
     {attr for attr in vars(SimpleTestCase) if attr.startswith("assert")},

pytest_django/fixtures.py

@@ -468,7 +468,7 @@ def async_rf() -> "django.test.client.AsyncRequestFactory":
 
 
 class SettingsWrapper:
-    _to_restore = []  # type: List[Any]
+    _to_restore: List[Any] = []
 
     def __delattr__(self, attr: str) -> None:
         from django.test import override_settings
@@ -630,7 +630,7 @@ def _capture_on_commit_callbacks(
 
     # Polyfill of Django code as of Django 3.2.
     if get_django_version() < (3, 2):
-        callbacks = []  # type: List[Callable[[], Any]]
+        callbacks: List[Callable[[], Any]] = []
         start_count = len(connections[using].run_on_commit)
         try:
             yield callbacks

pytest_django/lazy_django.py

@@ -24,7 +24,7 @@ def django_settings_is_configured() -> bool:
     ret = bool(os.environ.get("DJANGO_SETTINGS_MODULE"))
 
     if not ret and "django.conf" in sys.modules:
-        django_conf = sys.modules["django.conf"]  # type: Any
+        django_conf: Any = sys.modules["django.conf"]
         return django_conf.settings.configured
 
     return ret

pytest_django/live_server_helper.py

@@ -13,7 +13,7 @@ def __init__(self, addr: str) -> None:
         from django.test.testcases import LiveServerThread
         from django.test.utils import modify_settings
 
-        liveserver_kwargs = {}  # type: Dict[str, Any]
+        liveserver_kwargs: Dict[str, Any] = {}
 
         connections_override = {}
         for conn in connections.all():

pytest_django_test/app/migrations/0001_initial.py

@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = []  # type: List[Tuple[str, str]]
+    dependencies: List[Tuple[str, str]] = []
 
     operations = [
         migrations.CreateModel(

pytest_django_test/app/models.py

@@ -3,9 +3,9 @@
 
 # Routed to database "main".
 class Item(models.Model):
-    name = models.CharField(max_length=100)  # type: str
+    name: str = models.CharField(max_length=100)
 
 
 # Routed to database "second".
 class SecondItem(models.Model):
-    name = models.CharField(max_length=100)  # type: str
+    name: str = models.CharField(max_length=100)