mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-14 04:50:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

replaced str concat with .write_line(); replaced \t with spaces; removed trailing space in logs

Browse Source
This commit is contained in:
marqueewinq
2019-09-24 16:25:27 +03:00
parent e0155fbd66
commit cb164ef629
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pre_commit/error_handler.py
View File

@@ -37,22 +37,32 @@ def _log_and_exit(msg, exc, formatted):
log_path = os.path.join(store.directory, 'pre-commit.log')
output.write_line('Check the log at {}'.format(log_path))
meta_info_msg = '### version information\n```\n'
meta_info_msg += 'pre-commit.version: {}\n'.format(C.VERSION)
meta_info_msg += 'sys.version: \n{}\n'.format(
'\n'.join(
[
'\t{}'.format(line)
for line in sys.version.splitlines()
],
),
)
meta_info_msg += 'sys.executable: {}\n'.format(sys.executable)
meta_info_msg += 'os.name: {}\n'.format(os.name)
meta_info_msg += 'sys.platform: {}\n```\n'.format(sys.platform)
meta_info_msg += '### error information\n```\n'
with open(log_path, 'wb') as log:
output.write(meta_info_msg, stream=log)
output.write_line(
'### version information\n```', stream=log,
)
output.write_line(
'pre-commit.version: {}'.format(C.VERSION), stream=log,
)
output.write_line(
'sys.version:\n{}'.format(
'\n'.join(
[
' {}'.format(line)
for line in sys.version.splitlines()
],
),
),
stream=log,
)
output.write_line(
'sys.executable: {}'.format(sys.executable), stream=log,
)
output.write_line('os.name: {}'.format(os.name), stream=log)
output.write_line(
'sys.platform: {}\n```'.format(sys.platform), stream=log,
)
output.write_line('### error information\n```', stream=log)
output.write(error_msg, stream=log)
output.write_line(formatted, stream=log)
output.write('\n```\n', stream=log)

2
tests/error_handler_test.py
View File

@@ -115,7 +115,7 @@ def test_log_and_exit(cap_out, mock_store_dir):
r'^### version information\n'
r'```\n'
r'pre-commit.version: \d+\.\d+\.\d+\n'
r'sys.version: (.*\n)*'
r'sys.version:\n( .*\n)*'
r'sys.executable: .*\n'
r'os.name: .*\n'
r'sys.platform: .*\n'