Merge remote-tracking branch 'upstream/master' into unicode_literal_usage

Author: manu-chroma

tests/test_fetch.py

@@ -3,6 +3,8 @@
 from __future__ import absolute_import
 import unittest
 
+from six.moves import urllib
+
 import schema_salad.main
 import schema_salad.ref_resolver
 import schema_salad.schema
@@ -35,6 +37,16 @@ def check_exists(self, url):  # type: (unicode) -> bool
                 else:
                     return False
 
+	    def urljoin(self, base, url):
+                urlsp = urllib.parse.urlsplit(url)
+                if urlsp.scheme:
+                    return url
+                basesp = urllib.parse.urlsplit(base)
+
+                if basesp.scheme == "keep":
+                    return base + "/" + url
+                return urllib.parse.urljoin(base, url)
+
         def test_resolver(d, a):
             return "baz:bar/" + a
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-lint, py27-unit, py27-pipconflictchecker, py36-lint, py35-lint, py34-lint, py33-lint
+envlist = py27-lint, py27-unit, py27-pipconflictchecker, py36-lint, py35-lint, py34-lint, py33-lint, py35-mypy2
 skipsdist = True
 
 [travis]