Remove deprecated File alias for VTKFile (#4756)

Author: connorjward

firedrake/__init__.py

@@ -75,6 +75,7 @@ def init_petsc():
 from firedrake.mg.opencascade_mh import *
 from firedrake.norms import *
 from firedrake.nullspace import *
+from firedrake.output import *
 from firedrake.parameters import *
 from firedrake.parloops import *
 from firedrake.projection import *
@@ -96,11 +97,7 @@ def init_petsc():
 set_log_handlers(comm=COMM_WORLD)
 
 # Moved functionality
-from firedrake._deprecation import plot, File  # noqa: F401
-# Once `File` is deprecated update the above line removing `File` and add
-#   from firedrake._deprecation import output
-#   sys.modules["firedrake.output"] = output
-from firedrake.output import *
+from firedrake._deprecation import plot  # noqa: F401
 import sys
 sys.modules["firedrake.plot"] = plot
 from firedrake.plot import *

firedrake/_deprecation.py

@@ -2,8 +2,6 @@
 """
 import importlib
 
-from warnings import warn
-
 
 class _fake_module:
     """ Object which behaves like a module
@@ -47,28 +45,6 @@ def __call__(*args, **kwargs):
         return __call__
 
 
-# Deprecate output.File in the global namespace
-output = _fake_module(
-    "firedrake.output",
-    ["File", ],
-    ["VTKFile", ]
-)
-
-
-# I hate it
-def File(*args, **kwargs):
-    """Deprecated File constructor.
-
-    Use `VTKFile` from `firedrake.output` instead
-    """
-    from .output import VTKFile
-    warn(
-        "The use of `File` for output is deprecated, please update your "
-        "code to use `VTKFile` from `firedrake.output`."
-    )
-    return VTKFile(*args, **kwargs)
-
-
 # Deprecate plotting in the global namespace
 plot = _fake_module(
     "firedrake.pyplot",