Merge branch 'master' into quiet-external-schema

Author: mr-c

schema_salad/ref_resolver.py

@@ -189,7 +189,7 @@ def add_schemas(self, ns, base_url):
                         self.cache[fetchurl].parse(data=content, format=fmt)
                         self.graph += self.cache[fetchurl]
                         break
-                    except xml.sax.SAXParseException:  # type: ignore
+                    except xml.sax.SAXParseException:
                         pass
                     except TypeError:
                         pass
@@ -661,12 +661,21 @@ def fetch(self, url, inject_ids=True):  # type: (unicode, bool) -> Any
             self.idx[url] = result
         return result
 
-    def check_file(self, fn):  # type: (unicode) -> bool
-        if fn.startswith("file://"):
-            u = urlparse.urlsplit(fn)
-            return os.path.exists(u.path)
+    def check_file(self, url):  # type: (unicode) -> bool
+        split = urlparse.urlsplit(url)
+        scheme, path = split.scheme, split.path
+
+        if scheme in [u'http', u'https'] and self.session:
+            try:
+                resp = self.session.head(url)
+                resp.raise_for_status()
+            except Exception as e:
+                return False
+            return True
+        elif scheme == 'file':
+            return os.path.exists(path)
         else:
-            return False
+            raise ValueError('Unsupported scheme in url: %s' % url)
 
     FieldType = TypeVar('FieldType', unicode, List[unicode], Dict[unicode, Any])
 

typeshed/2.7/requests/sessions.pyi

@@ -78,7 +78,7 @@ class Session(SessionRedirectMixin):
                 json=...) -> Response: ...
     def get(self, url: AnyStr, **kwargs) -> Response: ...
     def options(self, url: str, **kwargs) -> Response: ...
-    def head(self, url: str, **kwargs) -> Response: ...
+    def head(self, url: AnyStr, **kwargs) -> Response: ...
     def post(self, url: str, data=..., json=..., **kwargs) -> Response: ...
     def put(self, url: str, data=..., **kwargs) -> Response: ...
     def patch(self, url: str, data=..., **kwargs) -> Response: ...