Drop old deprecated code

tests/test_image.py

@@ -52,7 +52,6 @@ def test_opens_jpeg(self):
  image = Image.open(f)
  self.assertIsInstance(image, JPEGImageFile)
  self.assertEqual(image.format_name, "jpeg")
- self.assertEqual(image.original_format, "jpeg")
  self.assertEqual(image.mime_type, "image/jpeg")
 
  def test_opens_png(self):
@@ -63,7 +62,6 @@ def test_opens_png(self):
  image = Image.open(f)
  self.assertIsInstance(image, PNGImageFile)
  self.assertEqual(image.format_name, "png")
- self.assertEqual(image.original_format, "png")
  self.assertEqual(image.mime_type, "image/png")
 
  def test_opens_gif(self):
@@ -74,7 +72,6 @@ def test_opens_gif(self):
  image = Image.open(f)
  self.assertIsInstance(image, GIFImageFile)
  self.assertEqual(image.format_name, "gif")
- self.assertEqual(image.original_format, "gif")
  self.assertEqual(image.mime_type, "image/gif")
 
  def test_raises_error_on_invalid_header(self):
@@ -90,7 +87,6 @@ def test_opens_svg(self):
  image = Image.open(f)
  self.assertIsInstance(image, SvgImageFile)
  self.assertEqual(image.format_name, "svg")
- self.assertEqual(image.original_format, "svg")
 
  def test_invalid_svg_raises(self):
  f = io.BytesIO(b"<svg><")

willow/image.py

@@ -1,12 +1,10 @@
 import re
-import warnings
 
 import filetype
 from defusedxml import ElementTree
 from filetype.types import image as image_types
 
 from .registry import registry
-from .utils.deprecation import RemovedInWillow05Warning
 
 
 class UnrecognisedImageFormatError(IOError):
@@ -178,15 +176,6 @@ def mime_type(self):
  """
  raise NotImplementedError
 
- @property
- def original_format(self):
- warnings.warn(
- "Image.original_format has been renamed to Image.format_name.",
- RemovedInWillow05Warning,
- )
-
- return self.format_name
-
  def __init__(self, f):
  self.f = f
 

willow/utils/deprecation.py

@@ -1,2 +1,2 @@
-class RemovedInWillow05Warning(DeprecationWarning):
+class RemovedInWillow17Warning(DeprecationWarning):
  pass