Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sourcery refactored master branch #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

sourcery-ai[bot]
Copy link

@sourcery-ai sourcery-ai bot commented Apr 6, 2021

Branch master refactored by Sourcery.

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

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 master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

@sourcery-ai sourcery-ai bot requested a review from kkujansuu April 6, 2021 18:40
Comment on lines -63 to +65
for pt in self.dbstate.db.get_place_types():
yield pt
yield from self.dbstate.db.get_place_types()
place_type_instance = PlaceType()
for pt in place_type_instance.get_standard_names():
yield pt
yield from place_type_instance.get_standard_names()
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function PlaceTool.__typenames refactored with the following changes:

  • Replace yield inside for loop with yield from (yield-from)

if tagname:
tag = self.__find_tag(tagname)
else:
tag = None
tag = self.__find_tag(tagname) if tagname else None
typename = self.typecombo.get_child().get_text().strip()
if typename:
ptype = PlaceType(typename)
else:
ptype = None
ptype = PlaceType(typename) if typename else None
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function PlaceTool.__apply refactored with the following changes:

Comment on lines -296 to +291
for placeref in place.placeref_list:
if self.__encloses(handle1, placeref.ref): return True
return False
return any(
self.__encloses(handle1, placeref.ref)
for placeref in place.placeref_list
)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function PlaceTool.__encloses refactored with the following changes:

  • Use any() instead of for loop (use-any)

Comment on lines -402 to +400
if enclosing_handles == []:
if place.get_placeref_list() == []:
top_level[name] = (handle,place)
elif enclosing_handles_set.intersection(place.get_placeref_list()):
if (
enclosing_handles == []
and place.get_placeref_list() == []
or enclosing_handles != []
and enclosing_handles_set.intersection(place.get_placeref_list())
):
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function PlaceTool.get_top_level refactored with the following changes:

@sourcery-ai
Copy link
Author

sourcery-ai bot commented Apr 6, 2021

Sourcery Code Quality Report

✅  Merging this PR will increase code quality in the affected files by 0.09%.

Quality metrics Before After Change
Complexity 8.31 ⭐ 7.72 ⭐ -0.59 👍
Method Length 81.17 🙂 80.52 🙂 -0.65 👍
Working memory 9.88 😞 9.93 😞 0.05 👎
Quality 57.56% 🙂 57.65% 🙂 0.09% 👍
Other metrics Before After Change
Lines 353 348 -5
Changed files Quality Before Quality After Quality Change
PlaceTool/PlaceTool.py 57.56% 🙂 57.65% 🙂 0.09% 👍

Here are some functions in these files that still need a tune-up:

File Function Complexity Length Working Memory Quality Recommendation
PlaceTool/PlaceTool.py PlaceTool.__apply 27 😞 262 ⛔ 15 😞 24.50% ⛔ Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
PlaceTool/PlaceTool.py PlaceTool.__generate_hierarchy 22 😞 195 😞 12 😞 35.88% 😞 Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
PlaceTool/PlaceTool.py PlaceTool.__create_gui 0 ⭐ 629 ⛔ 12 😞 46.24% 😞 Try splitting into smaller methods. Extract out complex expressions
PlaceTool/PlaceTool.py PlaceTool.__set_enclosing_place 3 ⭐ 77 🙂 11 😞 67.41% 🙂 Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

  • ⭐ excellent
  • 🙂 good
  • 😞 poor
  • ⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.


Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Let us know what you think of it by mentioning @sourcery-ai in a comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants