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.

Sign up for GitHub

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

Replace deprecated imp module with importlib for Python compatibility #1465

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

Replace deprecated imp module with importlib for Python compatibility #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion thefuck/conf.py
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

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

If you aren't doing anything on error, surely it would just be better to remove the try entirely. If load_source isn't available, it will fail later on with the instantiation of Settings at the bottom anyway, leading to a more confusing error message.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ def load_source(name, pathname, _file=None):
module_spec.loader.exec_module(module)
return module
except ImportError:
from imp import load_source
# This block is no longer needed if importlib.util is always available.
pass


class Settings(dict):
Expand Down
26 changes: 26 additions & 0 deletions ~/.config/thefuck/settings.py
View file
Open in desktop
Copy link

@cyuria cyuria Sep 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure exactly what is going on here

Edit: It looks like somehow your settings have made it into the PR

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# The Fuck settings file
#
# The rules are defined as in the example bellow:
#
# rules = ['cd_parent', 'git_push', 'python_command', 'sudo']
#
# The default values are as follows. Uncomment and change to fit your needs.
# See https://github.com/nvbn/thefuck#settings for more information.
#

# rules = [<const: All rules enabled>]
# exclude_rules = []
# wait_command = 3
# require_confirmation = True
# no_colors = False
# debug = False
# priority = {}
# history_limit = None
# alter_history = True
# wait_slow_command = 15
# slow_commands = ['lein', 'react-native', 'gradle', './gradlew', 'vagrant']
# repeat = False
# instant_mode = False
# num_close_matches = 3
# env = {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}
# excluded_search_path_prefixes = []