Refactor duplicated code into shared helpers#3
Open
devin-ai-integration[bot] wants to merge 1 commit into
Open
Refactor duplicated code into shared helpers#3devin-ai-integration[bot] wants to merge 1 commit into
devin-ai-integration[bot] wants to merge 1 commit into
Conversation
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Author
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
calc.pyrepeated the sametk.Button(...)+.grid(...)construction ~11 times and the sametk.Label(...)+.pack(...)3 times, each with identical styling (fg=LABEL_COLOR,borderwidth=0,padx=24, etc.). This collapses those into two shared helpers and removes several smaller copy-paste blocks. Pure refactor — no behavior change (verified with a headless smoke test covering arithmetic,x²,√x, and memory M+/MR).Net: -81 / +50 lines.
Key changes:
Calculator:_create_button(text, command, row, column, bg=OFF_WHITE, font=DEFAULT_FONT_STYLE, columnspan=1)— builds + grids a styled button and returns it._create_label(text, font)— builds + packs a styled display label.create_*_buttonmethods now delegate to_create_button.create_operator_buttonsusesenumerateinstead of a manual counter.create_mc/mr/mplus/mminus_button, which even used\line continuations) are replaced by a data-drivencreate_memory_buttons()iterating a newself.memory_buttons = {"MC": (1,0), ...}map.square/sqrt/percshared theself.current_expression = str(eval(...)); self.update_label()idiom — extracted into_apply(expression):self.memol.config(text="M: "+str(self.mem))(in MS/M+/M-) extracted into_update_memory_label().add_to_expressionhad three branches that all did the same append; simplified to one guarded append (only skip a.when one is already present):Note: the pre-existing
iconphoto(... calc3.png)reference (file not in repo) is left untouched as out of scope.Link to Devin session: https://app.devin.ai/sessions/1fcf820df6684c45bdbd4f6851761fc1
Requested by: @martlyma