python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-17 00:07:37 +02:00
Code Issues Releases Activity

refactor try/except blocks to safe_print function

Browse Source
This commit is contained in:
Kelly Brazil
2022-04-26 14:25:34 -07:00
parent 0b407123c2
commit a4ef52b533
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jc/cli.py
View File

@ -84,16 +84,7 @@ if PYGMENTS_INSTALLED:
}
def asciify(string):
"""
Return a string downgraded from Unicode to ASCII with some simple
conversions.
"""
string = string.replace('©', '(c)')
# the ascii() function adds single quotes around the string
string = ascii(string)[1:-1]
string = string.replace(r'\n', '\n')
return string
def set_env_colors(env_colors=None):
@ -449,17 +440,11 @@ def main():
sys.exit(0)
if help_me:
try:
print(help_doc(sys.argv))
except UnicodeEncodeError:
print(asciify(help_doc(sys.argv)))
utils.safe_print(help_doc(sys.argv))
sys.exit(0)
if version_info:
try:
print(versiontext())
except UnicodeEncodeError:
print(asciify(versiontext()))
utils.safe_print(versiontext())
sys.exit(0)
# if magic syntax used, try to run the command and error if it's not found, etc.
@ -474,10 +459,7 @@ def main():
try:
magic_stdout, magic_stderr, magic_exit_code = run_user_command(run_command)
if magic_stderr:
try:
print(magic_stderr[:-1], file=sys.stderr)
except UnicodeEncodeError:
print(asciify(magic_stderr[:-1], file=sys.stderr))
utils.safe_print(magic_stderr[:-1], file=sys.stderr)
except OSError as e:
if debug:

27
jc/utils.py
View File

@ -9,6 +9,25 @@ from functools import lru_cache
from typing import List, Iterable, Union, Optional
def asciify(string: str) -> str:
"""
Return a string downgraded from Unicode to ASCII with some simple
conversions.
"""
string = string.replace('©', '(c)')
# the ascii() function adds single quotes around the string
string = ascii(string)[1:-1]
string = string.replace(r'\n', '\n')
return string
def safe_print(string: str, sep=' ', end='\n', file=sys.stdout, flush=False) -> None:
try:
print(string, sep=sep, end=end, file=file, flush=flush)
except UnicodeEncodeError:
print(asciify(string), sep=sep, end=end, file=file, flush=flush)
def warning_message(message_lines: List[str]) -> None:
"""
Prints warning message for non-fatal issues. The first line is
@ -36,13 +55,13 @@ def warning_message(message_lines: List[str]) -> None:
first_line = message_lines.pop(0)
first_str = f'jc: Warning - {first_line}'
first_str = first_wrapper.fill(first_str)
print(first_str, file=sys.stderr)
safe_print(first_str, file=sys.stderr)
for line in message_lines:
if line == '':
continue
message = next_wrapper.fill(line)
print(message, file=sys.stderr)
safe_print(message, file=sys.stderr)
def error_message(message_lines: List[str]) -> None:
@ -68,13 +87,13 @@ def error_message(message_lines: List[str]) -> None:
first_line = message_lines.pop(0)
first_str = f'jc: Error - {first_line}'
first_str = first_wrapper.fill(first_str)
print(first_str, file=sys.stderr)
safe_print(first_str, file=sys.stderr)
for line in message_lines:
if line == '':
continue
message = next_wrapper.fill(line)
print(message, file=sys.stderr)
safe_print(message, file=sys.stderr)
def compatibility(mod_name: str, compatible: List, quiet: bool = False) -> None: