Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) #267

sourcery-ai · 2023-11-11T20:14:52Z

Pull Request #266 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the 260-refactor-timestamp-and-timespan branch, then run:

git fetch origin sourcery/260-refactor-timestamp-and-timespan
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

watermelon-copilot-for-code-review · 2023-11-11T20:14:59Z

WatermelonAI Summary

AI Summary deactivated by sourcery-ai[bot]

GitHub PRs

#267 - Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) - By sourcery-ai[bot] Just now
#266 - Fix TimeStamp and TimeSpan class to use class_from_element method - By cleder Just now
#1 - Sourcery refactored main branch - By sourcery-ai[bot] 11 months ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

fastkml is an open repo and Watermelon will serve it for free.
🍉🫶
Have you starred Watermelon?

what-the-diff · 2023-11-11T20:15:19Z

PR Summary

Enhanced property retrieval in fastkml/kml.py
This update ensures properties like style_url, author, snippet, address, phone_number and geometry will return actual data only when it exists. Otherwise, it will now just return None, handling the cases where the expected data is not available much better.
Streamlined get_style_by_url method in fastkml/kml.py
The searching process for styles by their IDs has been made efficient using a generator expression which either returns the found style or yields None.
Optimized parsing and element creation in fastkml/times.py
With the use of the walrus operator, parsing date strings and creating subelements based on exists of self.begin and self.end values are now more efficient, ensuring unnecessary computations are eliminated.

watermelon-copilot-for-code-review · 2023-11-11T20:15:24Z

WatermelonAI Summary

AI Summary deactivated by sourcery-ai[bot]

GitHub PRs

#267 - Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) - By sourcery-ai[bot] Just now
#1 - Sourcery refactored main branch - By sourcery-ai[bot] 11 months ago
#258 - 245 refactor datapy (Sourcery refactored) - By sourcery-ai[bot] 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

fastkml is an open repo and Watermelon will serve it for free.
🍉🫶

codecov · 2023-11-11T20:16:16Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (046dd3f) 92.83% compared to head (1e44f7c) 92.88%.

Additional details and impacted files

@@                           Coverage Diff                           @@
##           260-refactor-timestamp-and-timespan     #267      +/-   ##
=======================================================================
+ Coverage                                92.83%   92.88%   +0.05%     
=======================================================================
  Files                                       34       34              
  Lines                                     4812     4795      -17     
=======================================================================
- Hits                                      4467     4454      -13     
+ Misses                                     345      341       -4

Files	Coverage Δ
fastkml/kml.py	`77.09% <100.00%> (+0.07%)`	⬆️
fastkml/times.py	`98.05% <100.00%> (-0.06%)`	⬇️
tests/base_test.py	`100.00% <100.00%> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ghost · 2023-11-11T20:16:18Z

👇 Click on the image for a new way to code review

Legend

watermelon-copilot-for-code-review · 2023-11-11T20:23:04Z

fastkml/kml.py

@@ -206,9 +206,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):


This file contains at least one console log. Please remove any present.

watermelon-copilot-for-code-review · 2023-11-11T20:23:05Z

WatermelonAI Summary

AI Summary deactivated by sourcery-ai[bot]

GitHub PRs

#267 - Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) - By sourcery-ai[bot] 8 minutes ago
#1 - Sourcery refactored main branch - By sourcery-ai[bot] 11 months ago
#258 - 245 refactor datapy (Sourcery refactored) - By sourcery-ai[bot] 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

fastkml is an open repo and Watermelon will serve it for free.
🍉🫶

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        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


Function _Feature.style_url refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        if self._atom_author:
-            return self._atom_author.name
-        return None
+        return self._atom_author.name if self._atom_author else None


Function _Feature.author refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-            text = self._snippet.get("text")
-            if text:
+            if text := self._snippet.get("text"):


Function _Feature.snippet refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        if self._address:
-            return self._address
-        return None
+        return self._address if self._address else None


Function _Feature.address refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        if self._phone_number:
-            return self._phone_number
-        return None
+        return self._phone_number if self._phone_number else None


Function _Feature.phone_number refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        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)


Function Document.get_style_by_url refactored with the following changes:

Use the built-in function next instead of a for-loop (use-next)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/kml.py

-        if self._geometry is not None:
-            return self._geometry.geometry
-        return None
+        return self._geometry.geometry if self._geometry is not None else None


Function Placemark.geometry refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/times.py

-        year_month_day_match = year_month_day.match(datestr)
-        if year_month_day_match:
+        if year_month_day_match := year_month_day.match(datestr):


Function KmlDateTime.parse refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-11T20:23:07Z

fastkml/times.py

-            text = str(self.begin)
-            if text:
+            if text := str(self.begin):
                begin = config.etree.SubElement(  # type: ignore[attr-defined]
                    element,
                    f"{self.ns}begin",
                )
                begin.text = text
        if self.end is not None:
-            text = str(self.end)
-            if text:
+            if text := str(self.end):


Function TimeSpan.etree_element refactored with the following changes:

Use named expression to simplify assignment and conditional [×2] (use-named-expression)

sourcery-ai · 2023-11-11T20:23:07Z

tests/base_test.py

-        element = cast(
-            types.Element,
-            config.etree.Element(config.KMLNS + "Base"),  # type: ignore[attr-defined]
-        )
+        element = cast(types.Element, config.etree.Element(f"{config.KMLNS}Base"))


Function TestStdLibrary.test_base_from_element_raises refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

This removes the following comments ( why? ):

# type: ignore[attr-defined]

sourcery-ai bot requested a review from cleder November 11, 2023 20:14

watermelon-copilot-for-code-review bot added the 👀 Take a deeper dive label Nov 11, 2023

sourcery-ai bot force-pushed the sourcery/260-refactor-timestamp-and-timespan branch from 5cba575 to 5a911ff Compare November 11, 2023 20:15

watermelon-copilot-for-code-review bot added 🚨 Don't Merge and removed 👀 Take a deeper dive labels Nov 11, 2023

'Refactored by Sourcery'

1e44f7c

sourcery-ai bot force-pushed the sourcery/260-refactor-timestamp-and-timespan branch from 5a911ff to 1e44f7c Compare November 11, 2023 20:22

watermelon-copilot-for-code-review bot reviewed Nov 11, 2023

View reviewed changes

sourcery-ai bot commented Nov 11, 2023

View reviewed changes

Base automatically changed from 260-refactor-timestamp-and-timespan to develop November 11, 2023 20:25

sourcery-ai bot closed this Nov 11, 2023

sourcery-ai bot deleted the sourcery/260-refactor-timestamp-and-timespan branch November 11, 2023 20:25

watermelon-copilot-for-code-review bot mentioned this pull request Nov 12, 2023

move_coordinates supports generators (Sourcery refactored) cleder/pygeoif#189

Closed

watermelon-copilot-for-code-review bot mentioned this pull request Nov 20, 2023

#263 refactor stylespy (Sourcery refactored) #272

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) #267

Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) #267

sourcery-ai bot commented Nov 11, 2023 •

edited

Loading

watermelon-copilot-for-code-review bot commented Nov 11, 2023

what-the-diff bot commented Nov 11, 2023

watermelon-copilot-for-code-review bot commented Nov 11, 2023

codecov bot commented Nov 11, 2023 •

edited

Loading

ghost commented Nov 11, 2023 •

edited by ghost

Loading

Legend

watermelon-copilot-for-code-review bot Nov 11, 2023

watermelon-copilot-for-code-review bot commented Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

sourcery-ai bot Nov 11, 2023

Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) #267

Fix TimeStamp and TimeSpan class to use class_from_element method (Sourcery refactored) #267

Conversation

sourcery-ai bot commented Nov 11, 2023 • edited Loading

watermelon-copilot-for-code-review bot commented Nov 11, 2023

WatermelonAI Summary

GitHub PRs

what-the-diff bot commented Nov 11, 2023

PR Summary

watermelon-copilot-for-code-review bot commented Nov 11, 2023

WatermelonAI Summary

GitHub PRs

codecov bot commented Nov 11, 2023 • edited Loading

Codecov Report

ghost commented Nov 11, 2023 • edited by ghost Loading

Legend

watermelon-copilot-for-code-review bot Nov 11, 2023

Choose a reason for hiding this comment

watermelon-copilot-for-code-review bot commented Nov 11, 2023

WatermelonAI Summary

GitHub PRs

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot commented Nov 11, 2023 •

edited

Loading

codecov bot commented Nov 11, 2023 •

edited

Loading

ghost commented Nov 11, 2023 •

edited by ghost

Loading