Remove pathlib2 because it is only used for one thing but creates dependency issues. (#79)

Author: tetron

requirements.txt

@@ -1,7 +1,6 @@
 typing==3.5.2.2 ; python_version>="2.7"
 avro-python3 ; python_version>="3"
 avro==1.8.1 ; python_version<"3"
-pathlib2==2.1.0
 ruamel.yaml==0.13.7
 rdflib==4.2.1
 rdflib-jsonld==0.4.0

schema_salad/ref_resolver.py

@@ -8,9 +8,8 @@
 import urlparse
 import re
 import copy
-import pprint
+import urllib
 from StringIO import StringIO
-import  pathlib2
 
 from . import validate
 from .aslist import aslist
@@ -37,6 +36,21 @@
 DocumentOrStrType = TypeVar(
     'DocumentOrStrType', CommentedSeq, CommentedMap, unicode)
 
+def file_uri(path):  # type: (unicode) -> unicode
+    if path.startswith("file://"):
+        return path
+    urlpath = urllib.pathname2url(str(path))
+    if urlpath.startswith("//"):
+        return "file:%s" % urlpath
+    else:
+        return "file://%s" % urlpath
+
+def uri_file_path(url):  # type: (unicode) -> unicode
+    split = urlparse.urlsplit(url)
+    if split.scheme == "file":
+        urllib.url2pathname(str(split.path))
+    else:
+        raise ValueError("Not a file URI")
 
 class NormDict(CommentedMap):
 
@@ -110,7 +124,7 @@ def fetch_text(self, url):
             return resp.text
         elif scheme == 'file':
             try:
-                with open(urllib.url2pathname(str(urlparse.urlparse(url).path))) as fp:
+                with open(urllib.url2pathname(str(path))) as fp:
                     read = fp.read()
                 if hasattr(read, "decode"):
                     return read.decode("utf-8")
@@ -139,7 +153,7 @@ def check_exists(self, url):  # type: (unicode) -> bool
                 return False
             return True
         elif scheme == 'file':
-            return os.path.exists(urllib.url2pathname(str(urlparse.urlparse(url).path)))
+            return os.path.exists(urllib.url2pathname(str(path)))
         else:
             raise ValueError('Unsupported scheme in url: %s' % url)
 
@@ -380,10 +394,10 @@ def resolve_ref(self,
         mixin = None            # type: Dict[unicode, Any]
 
         if not base_url:
-            base_url = pathlib2.Path(os.getcwd()).as_uri() + '/'
+            base_url = file_uri(os.getcwd()) + "/"
 
         if isinstance(ref, (str, unicode)) and os.sep == "\\":
-            # Convert Windows paths
+            # Convert Windows path separator in ref
             ref = ref.replace("\\", "/")
 
         sl = SourceLine(obj, None, ValueError)

setup.py

@@ -36,8 +36,7 @@
     'mistune >= 0.7.3, < 0.8',
     'typing >= 3.5.2, < 3.6',
     'CacheControl >= 0.11.7, < 0.12',
-    'lockfile >= 0.9',
-    'pathlib2 >= 2.1.0']
+    'lockfile >= 0.9']
 
 install_requires.append("avro")  # TODO: remove me once cwltool is
 # available in Debian Stable, Ubuntu 12.04 LTS