From dbc2ede8d91a22e14e52f5a07b0ddff1ab78cd6b Mon Sep 17 00:00:00 2001
From: Philip Meier <github.pmeier@posteo.de>
Date: Mon, 11 Sep 2023 09:29:10 +0200
Subject: [PATCH] remove deprecated functional modules

---
 test/test_transforms.py                     | 33 +--------------------
 torchvision/transforms/functional_pil.py    | 11 -------
 torchvision/transforms/functional_tensor.py | 11 -------
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 torchvision/transforms/functional_pil.py
 delete mode 100644 torchvision/transforms/functional_tensor.py

diff --git a/test/test_transforms.py b/test/test_transforms.py
index 7581bf33220..262b3622b0f 100644
--- a/test/test_transforms.py
+++ b/test/test_transforms.py
@@ -2,7 +2,6 @@
 import os
 import random
 import re
-import textwrap
 import warnings
 from functools import partial
 
@@ -25,7 +24,7 @@
 except ImportError:
     stats = None
 
-from common_utils import assert_equal, assert_run_python_script, cycle_over, float_dtypes, int_dtypes
+from common_utils import assert_equal, cycle_over, float_dtypes, int_dtypes
 
 
 GRACE_HOPPER = get_file_path_2(
@@ -2250,35 +2249,5 @@ def test_random_grayscale_with_grayscale_input():
     torch.testing.assert_close(F.pil_to_tensor(output_pil), image_tensor)
 
 
-# TODO: remove in 0.17 when we can delete functional_pil.py and functional_tensor.py
-@pytest.mark.parametrize(
-    "import_statement",
-    (
-        "from torchvision.transforms import functional_pil",
-        "from torchvision.transforms import functional_tensor",
-        "from torchvision.transforms.functional_tensor import resize",
-        "from torchvision.transforms.functional_pil import resize",
-    ),
-)
-@pytest.mark.parametrize("from_private", (True, False))
-def test_functional_deprecation_warning(import_statement, from_private):
-    if from_private:
-        import_statement = import_statement.replace("functional", "_functional")
-        source = f"""
-        import warnings
-
-        with warnings.catch_warnings():
-            warnings.simplefilter("error")
-            {import_statement}
-        """
-    else:
-        source = f"""
-        import pytest
-        with pytest.warns(UserWarning, match="removed in 0.17"):
-            {import_statement}
-        """
-    assert_run_python_script(textwrap.dedent(source))
-
-
 if __name__ == "__main__":
     pytest.main([__file__])
diff --git a/torchvision/transforms/functional_pil.py b/torchvision/transforms/functional_pil.py
deleted file mode 100644
index bfcbf1a5442..00000000000
--- a/torchvision/transforms/functional_pil.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import warnings
-
-from torchvision.transforms._functional_pil import *  # noqa
-
-warnings.warn(
-    "The torchvision.transforms.functional_pil module is deprecated "
-    "in 0.15 and will be **removed in 0.17**. Please don't rely on it. "
-    "You probably just need to use APIs in "
-    "torchvision.transforms.functional or in "
-    "torchvision.transforms.v2.functional."
-)
diff --git a/torchvision/transforms/functional_tensor.py b/torchvision/transforms/functional_tensor.py
deleted file mode 100644
index a9f7f509074..00000000000
--- a/torchvision/transforms/functional_tensor.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import warnings
-
-from torchvision.transforms._functional_tensor import *  # noqa
-
-warnings.warn(
-    "The torchvision.transforms.functional_tensor module is deprecated "
-    "in 0.15 and will be **removed in 0.17**. Please don't rely on it. "
-    "You probably just need to use APIs in "
-    "torchvision.transforms.functional or in "
-    "torchvision.transforms.v2.functional."
-)