sailplatform
diff --git a/Collapse file
‎README.rst‎
Copy file name to clipboardExpand all lines: README.rst
+3-1Lines changed: 3 additions & 1 deletion
Display the source diff
Display the rich diff b/Collapse file
‎README.rst‎
Copy file name to clipboardExpand all lines: README.rst
+3-1Lines changed: 3 additions & 1 deletion
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎caliper/base.py‎
Copy file name to clipboardExpand all lines: caliper/base.py
+4-1Lines changed: 4 additions & 1 deletion b/Collapse file
‎caliper/base.py‎
Copy file name to clipboardExpand all lines: caliper/base.py
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎tox.ini‎
Copy file name to clipboardExpand all lines: tox.ini
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎tox.ini‎
Copy file name to clipboardExpand all lines: tox.ini
+1Lines changed: 1 addition & 0 deletions
@@ -19,7 +19,9 @@ packages:
 
 * requests -- (Apache 2 licensed)
 
-* tox, discover -- (soft-dependency used only for tests, MIT licensed)
+* rfc3986 -- (Apache 2 licensed)
+
+* tox, discover -- (soft-dependencies used only for tests, MIT licensed)
 
 To work with the `imsglobal_caliper` bundle (maintain, use, run tests) you'll need
 to have these third-party packages in your local Python environment.
 
@@ -27,6 +27,7 @@
 import collections, copy, importlib, json, re, warnings
 from aniso8601 import (parse_datetime as aniso_parse_datetime, parse_date as aniso_parse_date,
                        parse_time as aniso_parse_time, parse_duration as aniso_parse_duration)
+from rfc3986 import is_valid_uri as rfc3986_is_valid_uri
 from urllib.parse import urlparse as urllib_urlparse
 
 from caliper.constants import CALIPER_CLASSES, CALIPER_TYPES
@@ -69,7 +70,9 @@ def is_valid_time(time):
 def is_valid_URI(uri):
     if not uri:
         return False
-    elif isinstance(uri, str) and (urllib_urlparse(uri).geturl() == uri):
+    elif (isinstance(uri, str)
+          and (urllib_urlparse(uri).geturl() == uri)
+          and rfc3986_is_valid_uri(uri)):
         return True
     else:
         return False
 
@@ -19,7 +19,7 @@
 
 _packages = ['caliper', 'caliper.util', 'caliper_tests']
 
-_requires = ['aniso8601 >= 1.1.0', 'future >= 0.14.3', 'requests >= 2.7.0']
+_requires = ['aniso8601 >= 1.1.0', 'future >= 0.14.3', 'requests >= 2.7.0', 'rfc3986 == 0.4.1']
 
 _fixtures = ['fixtures/src/test/resources/fixtures/*.json']
 
 
@@ -8,4 +8,5 @@ deps =
      discover
      future
      requests
+     rfc3986
 commands = discover