Resolved merge conflicts with main and removed Windows specific implementations

Signed-off-by: Doug Halley <[email protected]>

Author: douglascomet

src/py-opentimelineio/opentimelineio/url_utils.py

@@ -68,10 +68,6 @@ def filepath_from_url(urlstr):
     if PureWindowsPath(parsed_result.netloc).drive:
         filepath = PurePath(parsed_result.netloc + decoded_parsed_path)
 
-    # Check if the specified index has a specified `drive`, if so then do nothing
-    elif filepath.drive:
-        filepath = filepath
-
     # Check if the specified index is a windows drive, then offset the path
     elif PureWindowsPath(filepath.parts[1]).drive:
         # Remove leading "/" if/when `request.url2pathname` yields "/S:/path/file.ext"
@@ -86,9 +82,4 @@ def filepath_from_url(urlstr):
     # Convert "\" to "/" if needed
     path = filepath.as_posix()
 
-    # Since the previous code handles Windows drive letter, we can assume that any path
-    # starting with a "/" is a UNC path if executed is run on Windows.
-    if path.startswith('/') and sys.platform == 'win32':
-        path = '/' + path
-
     return path