MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-02-21 20:38:54 +00:00
Code Issues Releases Wiki Activity

#N/A Fix debug output with unicode commands

Browse Source
This commit is contained in:
nvbn 2015-07-20 19:35:32 +03:00
parent cd084c8ba6
commit 7b32f1df04
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
thefuck/main.py
View File

@ -80,11 +80,11 @@ def get_command(settings, args):
return return
script = shells.from_shell(script) script = shells.from_shell(script)
logs.debug('Call: {}'.format(script), settings) logs.debug(u'Call: {}'.format(script), settings)
env = dict(os.environ) env = dict(os.environ)
env.update(settings.env) env.update(settings.env)
logs.debug('Executing with env: {}'.format(env), settings) logs.debug(u'Executing with env: {}'.format(env), settings)
result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env) result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
if wait_output(settings, result): if wait_output(settings, result):
@ -132,21 +132,21 @@ def main():
colorama.init() colorama.init()
user_dir = setup_user_dir() user_dir = setup_user_dir()
settings = conf.get_settings(user_dir) settings = conf.get_settings(user_dir)
logs.debug('Run with settings: {}'.format(pformat(settings)), settings) logs.debug(u'Run with settings: {}'.format(pformat(settings)), settings)
command = get_command(settings, sys.argv) command = get_command(settings, sys.argv)
if command: if command:
logs.debug('Received stdout: {}'.format(command.stdout), settings) logs.debug(u'Received stdout: {}'.format(command.stdout), settings)
logs.debug('Received stderr: {}'.format(command.stderr), settings) logs.debug(u'Received stderr: {}'.format(command.stderr), settings)
rules = get_rules(user_dir, settings) rules = get_rules(user_dir, settings)
logs.debug( logs.debug(
'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)), u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
settings) settings)
matched_rule = get_matched_rule(command, rules, settings) matched_rule = get_matched_rule(command, rules, settings)
if matched_rule: if matched_rule:
logs.debug('Matched rule: {}'.format(matched_rule.name), settings) logs.debug(u'Matched rule: {}'.format(matched_rule.name), settings)
run_rule(matched_rule, command, settings) run_rule(matched_rule, command, settings)
return return