Make split_frag optional in converting fileuri. (#88)

* Make split_frag optional in converting fileuri.

Author: tetron

schema_salad/ref_resolver.py

@@ -36,12 +36,16 @@
 DocumentOrStrType = TypeVar(
     'DocumentOrStrType', CommentedSeq, CommentedMap, unicode)
 
-def file_uri(path):  # type: (str) -> str
+def file_uri(path, split_frag=False):  # type: (str, bool) -> str
     if path.startswith("file://"):
         return path
-    pathsp = path.split("#", 2)
-    frag = "#" + urllib.quote(str(pathsp[1])) if len(pathsp) == 2 else ""
-    urlpath = urllib.pathname2url(str(pathsp[0]))
+    if split_frag:
+        pathsp = path.split("#", 2)
+        frag = "#" + urllib.quote(str(pathsp[1])) if len(pathsp) == 2 else ""
+        urlpath = urllib.pathname2url(str(pathsp[0]))
+    else:
+        urlpath = urllib.pathname2url(path)
+        frag = ""
     if urlpath.startswith("//"):
         return "file:%s%s" % (urlpath, frag)
     else:

schema_salad/tests/test_examples.py

@@ -367,7 +367,8 @@ def test_file_uri(self):
         # windows box should add an alternate test.
         self.assertEquals("file:///foo/bar%20baz/quux", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux"))
         self.assertEquals("/foo/bar baz/quux", schema_salad.ref_resolver.uri_file_path("file:///foo/bar%20baz/quux"))
-        self.assertEquals("file:///foo/bar%20baz/quux#zing%20zong", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux#zing zong"))
+        self.assertEquals("file:///foo/bar%20baz/quux%23zing%20zong", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux#zing zong"))
+        self.assertEquals("file:///foo/bar%20baz/quux#zing%20zong", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux#zing zong", split_frag=True))
         self.assertEquals("/foo/bar baz/quux#zing zong", schema_salad.ref_resolver.uri_file_path("file:///foo/bar%20baz/quux#zing%20zong"))