Skip to content

Commit

Permalink
'Refactored by Sourcery'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sourcery AI committed Nov 20, 2023
1 parent ebd08e4 commit b1d1589
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 25 deletions.
2 changes: 1 addition & 1 deletion fastkml/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class DataType(REnum):
def convert(self, value: str) -> Union[str, int, float, bool]:
"""Convert the data type to a python type."""
if self == DataType.string:
return str(value)
return value

Check warning on line 121 in fastkml/enums.py

View check run for this annotation

Codecov / codecov/patch

fastkml/enums.py#L121

Added line #L121 was not covered by tests
if self in {DataType.int_, DataType.uint, DataType.short, DataType.ushort}:
return int(value)
if self in {DataType.float_, DataType.double}:
Expand Down
28 changes: 7 additions & 21 deletions fastkml/kml.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,7 @@ def style_url(self) -> Optional[str]:
Returns the url only, not a full StyleUrl object.
if you need the full StyleUrl object use _style_url.
"""
if isinstance(self._style_url, StyleUrl):
return self._style_url.url
return None
return self._style_url.url if isinstance(self._style_url, StyleUrl) else None

@style_url.setter
def style_url(self, styleurl: Union[str, StyleUrl, None]) -> None:
Expand Down Expand Up @@ -262,9 +260,7 @@ def link(self, url) -> None:

@property
def author(self) -> None:
if self._atom_author:
return self._atom_author.name
return None
return self._atom_author.name if self._atom_author else None

@author.setter
def author(self, name) -> None:
Expand Down Expand Up @@ -300,8 +296,7 @@ def snippet(self) -> Optional[Dict[str, Any]]:
if not self._snippet:
return None
if isinstance(self._snippet, dict):
text = self._snippet.get("text")
if text:
if text := self._snippet.get("text"):
assert isinstance(text, str)
max_lines = self._snippet.get("maxLines", None)
if max_lines is None:
Expand Down Expand Up @@ -339,9 +334,7 @@ def snippet(self, snip=None) -> None:

@property
def address(self) -> None:
if self._address:
return self._address
return None
return self._address if self._address else None

@address.setter
def address(self, address) -> None:
Expand All @@ -354,9 +347,7 @@ def address(self, address) -> None:

@property
def phone_number(self) -> None:
if self._phone_number:
return self._phone_number
return None
return self._phone_number if self._phone_number else None

@phone_number.setter
def phone_number(self, phone_number) -> None:
Expand Down Expand Up @@ -1641,10 +1632,7 @@ def etree_element(

def get_style_by_url(self, style_url: str) -> Union[Style, StyleMap]:
id = urlparse.urlparse(style_url).fragment
for style in self.styles():
if style.id == id:
return style
return None
return next((style for style in self.styles() if style.id == id), None)


class Folder(_Container):
Expand Down Expand Up @@ -1711,9 +1699,7 @@ def __init__(

@property
def geometry(self) -> Optional[AnyGeometryType]:
if self._geometry is not None:
return self._geometry.geometry
return None
return self._geometry.geometry if self._geometry is not None else None

def from_element(self, element: Element, strict=False) -> None:
super().from_element(element)
Expand Down
4 changes: 1 addition & 3 deletions fastkml/styles.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ def strtobool(val: str) -> int:
val = val.lower()
if val == "false":
return 0
if val == "true":
return 1
return int(float(val))
return 1 if val == "true" else int(float(val))


class StyleUrl(_BaseObject):
Expand Down

0 comments on commit b1d1589

Please sign in to comment.