Switched to using requests rather than direct use of urllib3

- Use a StringIO buffer as YAML is stupid and won't use a Byte Stream

Author: Beirdo

openapi_spec_validator/__init__.py

@@ -9,7 +9,7 @@
 
 __author__ = 'Artur Maciag'
 __email__ = 'maciag.artur@gmail.com'
-__version__ = '0.2.8'
+__version__ = '0.2.9'
 __url__ = 'https://github.com/p1c2u/openapi-spec-validator'
 __license__ = 'Apache License, Version 2.0'
 

openapi_spec_validator/handlers.py

@@ -1,9 +1,10 @@
 """OpenAPI spec validator handlers module."""
 import contextlib
+from io import StringIO
 
 from six.moves.urllib.parse import urlparse
-from six.moves.urllib.request import urlopen
 from yaml import load
+import requests
 
 from openapi_spec_validator.loaders import ExtendedSafeLoader
 
@@ -30,8 +31,16 @@ def __init__(self, *allowed_schemes, **options):
         self.allowed_schemes = allowed_schemes
 
     def __call__(self, url, timeout=1):
-        assert urlparse(url).scheme in self.allowed_schemes
-
-        f = urlopen(url, timeout=timeout)
-        with contextlib.closing(f) as fh:
+        scheme = urlparse(url).scheme
+        assert scheme in self.allowed_schemes
+
+        if scheme == "file":
+            filename = url[7:]
+            with open(filename) as fh:
+                return super(UrlHandler, self).__call__(fh)
+
+        response = requests.get(url, timeout=timeout)
+        response.raise_for_status()
+        data = response.text
+        with contextlib.closing(StringIO(data)) as fh:
             return super(UrlHandler, self).__call__(fh)

requirements.txt

@@ -1,3 +1,4 @@
 jsonschema
 PyYAML==4.2b4
 six==1.12.0
+requests

setup.py

@@ -75,6 +75,7 @@ def run_tests(self):
         "PyYAML>=5.1",
         "six",
         'pathlib2;python_version=="2.7"',
+        'requests',
     ],
     extras_require={
         'dev': [