Skip to content

fix: Remove unused imports in several modules #752#753

Merged
mattrose merged 1 commit intognome-terminator:masterfrom
nautics889:issue-752-remove-unused-imports
Feb 5, 2024
Merged

fix: Remove unused imports in several modules #752#753
mattrose merged 1 commit intognome-terminator:masterfrom
nautics889:issue-752-remove-unused-imports

Conversation

@nautics889
Copy link
Copy Markdown
Contributor

@nautics889 nautics889 commented May 2, 2023

Removed unused imports in:

  • terminator
  • terminatorlib/plugins/dir_open.py
  • terminatorlib/terminal.py
  • terminatorlib/terminal_popup_menu.py
  • terminatorlib/terminator.py
  • tests/test_signalman.py

All of those imports had been used before, according to the Git history, but were not removed as the code was updated and they are no longer being used.

@nautics889 nautics889 mentioned this pull request May 2, 2023
Closed
@mattrose
Copy link
Copy Markdown
Member

mattrose commented Jan 26, 2024 •
edited
Loading

I'm getting the following conflict trying to merge this into my master

Switched to a new branch 'nautics889-issue-752-remove-unused-imports'
From https://github.com/nautics889/terminator
 * branch              issue-752-remove-unused-imports -> FETCH_HEAD
Auto-merging terminatorlib/config.py
Auto-merging terminatorlib/plugins/mousefree_url_handler.py
CONFLICT (add/add): Merge conflict in terminatorlib/plugins/mousefree_url_handler.py
Auto-merging terminatorlib/prefseditor.py
error: could not apply 0ae2aba1... 1) Mouse less/free opening / yanking feature
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0ae2aba1... 1) Mouse less/free opening / yanking feature 2) plugin_util  file to assist this and other plugins with key-press Helper function 3) adding Key Binding Help Functions in above (2) to config and preferences->keybinding to have a consistent behavior

I could redo the merge with your changes, but I'd rather leave it up to you. Can you let me know if you can fix this up easily?

@mattrose mattrose added the question Further information is requested label Jan 26, 2024
@nautics889
fix: Remove unused imports in several modules gnome-terminator#752
6651b30 
Removed unused imports in:
* terminator
* terminatorlib/plugins/dir_open.py
* terminatorlib/terminal.py
* terminatorlib/terminal_popup_menu.py
* terminatorlib/terminator.py
* tests/test_signalman.py
@nautics889 nautics889 force-pushed the issue-752-remove-unused-imports branch from d5be5b9 to 6651b30 Compare January 26, 2024 18:22
@nautics889
Copy link
Copy Markdown
Contributor Author

nautics889 commented Jan 26, 2024

@mattrose sure, I guess rebase on top of the current master should help.

Can you try it now, please? CI checks are passed, none divergence between this branch and master, it should be able to merge.

@mattrose
Copy link
Copy Markdown
Member

mattrose commented Feb 5, 2024

merging. Sorry about the wait

@mattrose mattrose merged commit e9ef074 into gnome-terminator:master Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

question Further information is requested

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nautics889 @mattrose