simplify code, return to previous structure

Author: Tom McCormick

pyiceberg/io/pyarrow.py

@@ -398,18 +398,11 @@ def parse_location(location: str, properties: Properties = EMPTY_DICT) -> Tuple[
         default_netloc = properties.get("DEFAULT_NETLOC", "")
 
         if not uri.scheme:
-            scheme = default_scheme
-        if not uri.netloc:
-            netloc = default_netloc
-
-        if scheme in ("hdfs", "viewfs"):
-            return scheme, netloc, uri.path
+            return default_scheme, default_netloc, os.path.abspath(location)
+        elif uri.scheme in ("hdfs", "viewfs"):
+            return uri.scheme, uri.netloc, uri.path
         else:
-            # For non-HDFS URIs, include netloc in the path if present
-            path = uri.path if uri.scheme else os.path.abspath(location)
-            if netloc and not path.startswith(netloc):
-                path = f"{netloc}{path}"
-            return scheme, netloc, path
+            return uri.scheme, uri.netloc, f"{uri.netloc}{uri.path}"
 
     def _initialize_fs(self, scheme: str, netloc: Optional[str] = None) -> FileSystem:
         """Initialize FileSystem for different scheme."""

tests/io/test_pyarrow.py

@@ -2656,7 +2656,7 @@ def test_parse_location_defaults() -> None:
     )
     assert scheme == "scheme"
     assert netloc == "netloc:8000"
-    assert path == "netloc:8000/foo/bar"
+    assert path == "/foo/bar"
 
     scheme, netloc, path = PyArrowFileIO.parse_location(
         "/foo/bar", properties={"DEFAULT_SCHEME": "hdfs", "DEFAULT_NETLOC": "netloc:8000"}