Merge pull request #23 from NaturalHistoryMuseum/josh/remove_jpeg_option

Remove jpeg option
NaturalHistoryMuseum · May 16, 2022 · dfaa73a · dfaa73a
2 parents 9f54c8f + ebe72f4
commit dfaa73a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/iiif/ops.py b/iiif/ops.py
@@ -221,14 +221,11 @@ def parse_quality(quality: str) -> Quality:
 
 
 class Format(Enum):
-    jpg = ('jpg', 'jpeg')
-    png = ('png',)
-
-    def matches(self, value: str) -> bool:
-        return value in self.value
+    jpg = 'jpg'
+    png = 'png'
 
     def __str__(self) -> str:
-        return self.value[0]
+        return self.value
 
 
 def parse_format(fmt: str) -> Format:
@@ -242,7 +239,7 @@ def parse_format(fmt: str) -> Format:
     :return: a Format
     """
     for option in Format:
-        if option.matches(fmt):
+        if fmt == option.value:
             return option
 
     raise InvalidIIIFParameter('Format', fmt)

diff --git a/tests/test_ops.py b/tests/test_ops.py
@@ -209,9 +209,6 @@ class TestParseFormat:
     def test_level0(self):
         assert parse_format('jpg') == Format.jpg
 
-    def test_level0(self):
-        assert parse_format('jpeg') == Format.jpg
-
     def test_level2_png(self):
         assert parse_format('png') == Format.png