Simplifies uri file and swaps os to Path

Also, fixes uri creation in diagnostic tests

Author: gnikit

fortls/jsonrpc.py

@@ -1,19 +1,10 @@
 import json
-
-try:
-    import Queue
-except ImportError:
-    import queue as Queue
-
 import os
+import queue
 import threading
 from collections import deque
-
-try:
-    from urllib.parse import quote, unquote
-except ImportError:
-    from urllib2 import quote
-    from urlparse import unquote
+from pathlib import Path
+from urllib.parse import quote, unquote
 
 from fortls.constants import log
 
@@ -26,7 +17,7 @@ def path_from_uri(uri: str) -> str:
         _, path = uri.split("file:///", 1)
     else:
         _, path = uri.split("file://", 1)
-    return os.path.normpath(unquote(path))
+    return str(Path(unquote(path)).resolve())
 
 
 def path_to_uri(path: str) -> str:
@@ -185,7 +176,7 @@ def send_request_batch(self, requests):
 
         # We communicate the request ids using a thread safe queue.
         # It also allows us to bound the number of concurrent requests.
-        q = Queue.Queue(100)
+        q = queue.Queue(100)
 
         def send():
             for method, params in requests:

test/test_server.py

@@ -703,7 +703,7 @@ def check_return(results, ref_results):
     assert errcode == 0
     results.extend(res[1:])
 
-    root = Path(test_dir)
+    root = path_to_uri(str((test_dir / "diag" / "test_external.f90").resolve()))
     ref_results = [
         [],
         [],
@@ -720,7 +720,7 @@ def check_return(results, ref_results):
                 "relatedInformation": [
                     {
                         "location": {
-                            "uri": f"file://{root/'diag'/'test_external.f90'}",
+                            "uri": str(root),
                             "range": {
                                 "start": {"line": 5, "character": 0},
                                 "end": {"line": 5, "character": 0},
@@ -740,7 +740,7 @@ def check_return(results, ref_results):
                 "relatedInformation": [
                     {
                         "location": {
-                            "uri": f"file://{root/'diag'/'test_external.f90'}",
+                            "uri": str(root),
                             "range": {
                                 "start": {"line": 3, "character": 0},
                                 "end": {"line": 3, "character": 0},