Merge 085e7ca into 54f32f8

IIIF · Jan 27, 2020 · c97af3c · c97af3c
2 parents 54f32f8 + 085e7ca
commit c97af3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/iiif_validator/tests/info_json.py b/iiif_validator/tests/info_json.py
@@ -81,7 +81,7 @@ def run(self, result):
                             self.validationInfo.check('type-is-int: width', type(t['width']), int, result)
                     # extra version 3.0 checks        
                     if result.version[0] == "3":        
-                        self.validationInfo.check('correct-type', info['type'], "ImageService3", result, "Info.json missing required type of ImageService3.")
+                        self.validationInfo.check('correct-type', 'type' in info and info['type'], "ImageService3", result, "Info.json missing required type of ImageService3.")
                         self.validationInfo.check('license-renamed', 'license' in info, False, result,'license has been renamed rights in 3.0',warning=True)
                         if 'rights' in info:
                             self.validationInfo.check('type-is-uri: rights', info['rights'].startswith('http'), True, result,'Rights should be a single URI from Creative Commons, RightsStatements.org or URIs registered as extensions.')

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 lxml
 bottle
 python-magic
-pillow
+# Versions including 7 don't support python 2.x
+pillow<7
 mock