Skip to content

Commit

Permalink
Cleanup some unnecessary internal property accesses (#1177)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdraco authored Oct 5, 2024
1 parent d2892da commit 755ba9c
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions yarl/_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ def raw_authority(self) -> str:
@cached_property
def _default_port(self) -> Union[int, None]:
"""Default port for the scheme or None if not known."""
return DEFAULT_PORTS.get(self.scheme)
return DEFAULT_PORTS.get(self._val.scheme)

@cached_property
def _port_not_default(self) -> Union[int, None]:
Expand Down Expand Up @@ -781,7 +781,7 @@ def path_safe(self) -> str:
@cached_property
def _parsed_query(self) -> List[Tuple[str, str]]:
"""Parse query part of URL."""
return parse_qsl(self.raw_query_string, keep_blank_values=True)
return parse_qsl(self._val.query, keep_blank_values=True)

@cached_property
def query(self) -> "MultiDictProxy[str]":
Expand Down Expand Up @@ -809,7 +809,7 @@ def query_string(self) -> str:
Empty string if query is missing.
"""
return self._QS_UNQUOTER(self.raw_query_string)
return self._QS_UNQUOTER(self._val.query)

@cached_property
def path_qs(self) -> str:
Expand All @@ -821,9 +821,9 @@ def path_qs(self) -> str:
@cached_property
def raw_path_qs(self) -> str:
"""Encoded path of URL with query."""
if not self.raw_query_string:
if not self._val.query:
return self.raw_path
return f"{self.raw_path}?{self.raw_query_string}"
return f"{self.raw_path}?{self._val.query}"

@cached_property
def raw_fragment(self) -> str:
Expand All @@ -841,7 +841,7 @@ def fragment(self) -> str:
Empty string if fragment is missing.
"""
return self._UNQUOTER(self.raw_fragment)
return self._UNQUOTER(self._val.fragment)

@cached_property
def raw_parts(self) -> Tuple[str, ...]:
Expand Down Expand Up @@ -880,7 +880,7 @@ def parent(self) -> "URL":
"""
path = self.raw_path
if not path or path == "/":
if self.raw_fragment or self.raw_query_string:
if self._val.fragment or self._val.query:
return URL(self._val._replace(query="", fragment=""), encoded=True)
return self
parts = path.split("/")
Expand Down Expand Up @@ -1361,7 +1361,7 @@ def extend_query(self, *args: Any, **kwargs: Any) -> "URL":
new_query_string = self._get_str_query(*args, **kwargs)
if not new_query_string:
return self
if current_query := self.raw_query_string:
if current_query := self._val.query:
# both strings are already encoded so we can use a simple
# string join
if current_query[-1] == "&":
Expand Down Expand Up @@ -1425,7 +1425,7 @@ def with_fragment(self, fragment: Union[str, None]) -> "URL":
raise TypeError("Invalid fragment type")
else:
raw_fragment = self._FRAGMENT_QUOTER(fragment)
if self.raw_fragment == raw_fragment:
if self._val.fragment == raw_fragment:
return self
return URL(self._val._replace(fragment=raw_fragment), encoded=True)

Expand Down Expand Up @@ -1559,7 +1559,7 @@ def human_repr(self) -> str:
netloc = self._make_netloc(
user, password, host, self.explicit_port, encode_host=False
)
val = SplitResult(self.scheme, netloc, path, query_string, fragment)
val = SplitResult(self._val.scheme, netloc, path, query_string, fragment)
return urlunsplit(val)


Expand Down

0 comments on commit 755ba9c

Please sign in to comment.