Skip to content

Commit 2b8a3c6

Browse files
adamluiadamlui
committed
Alphabetized log methods
1 parent b3a0e06 commit 2b8a3c6

3 files changed

Lines changed: 70 additions & 69 deletions

File tree

  • get-min-py/src/get_min_py/cli/lib
  • remove-json-keys/src/remove_json_keys/lib
  • translate-messages/src/translate_messages/lib

‎get-min-py/src/get_min_py/cli/lib/log.py‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,6 @@ def version(cli: sn) -> None:
4444
print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION.lower()}: {cli.version}{colors.nc}')
4545
def warn(msg: str, *args, **kwargs) -> None : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
4646

47-
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
48-
from . import settings
49-
warned_set = _warned_keys[source]
50-
if flag in warned_set : return
51-
canonical_key = settings.get_canonical_key(flag)
52-
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
53-
if canonical_key:
54-
canonical_ctrl = getattr(settings.controls, canonical_key, None)
55-
if source == 'cli' and canonical_ctrl:
56-
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
57-
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
58-
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
59-
else: # show long flag replacement
60-
long_flags = [flag for flag in flags if flag.startswith('--')]
61-
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
62-
else:
63-
display_key = canonical_key
64-
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
65-
else:
66-
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
67-
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
68-
warn(msg) ; warned_set.add(flag)
69-
7047
def cmd_docs_url_exit(cli: sn, msg: str = '', cmd: str = 'help') -> None:
7148
if msg : error(msg)
7249
help_cmd(cli)
@@ -99,3 +76,27 @@ def trunc(msg: str, end: str = '\n') -> None:
9976
truncated_lines = [
10077
line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]
10178
print('\n'.join(truncated_lines), end=end)
79+
80+
81+
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
82+
from . import settings
83+
warned_set = _warned_keys[source]
84+
if flag in warned_set : return
85+
canonical_key = settings.get_canonical_key(flag)
86+
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
87+
if canonical_key:
88+
canonical_ctrl = getattr(settings.controls, canonical_key, None)
89+
if source == 'cli' and canonical_ctrl:
90+
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
91+
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
92+
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
93+
else: # show long flag replacement
94+
long_flags = [flag for flag in flags if flag.startswith('--')]
95+
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
96+
else:
97+
display_key = canonical_key
98+
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
99+
else:
100+
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
101+
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
102+
warn(msg) ; warned_set.add(flag)

‎remove-json-keys/src/remove_json_keys/lib/log.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,6 @@ def version(cli: sn) -> None:
4646
print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION.lower()}: {cli.version}{colors.nc}')
4747
def warn(msg: str, *args, **kwargs) -> None : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
4848

49-
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
50-
from . import settings
51-
warned_set = _warned_keys[source]
52-
if flag in warned_set : return
53-
canonical_key = settings.get_canonical_key(flag)
54-
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
55-
if canonical_key:
56-
canonical_ctrl = getattr(settings.controls, canonical_key, None)
57-
if source == 'cli' and canonical_ctrl:
58-
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
59-
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
60-
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
61-
else: # show long flag replacement
62-
long_flags = [flag for flag in flags if flag.startswith('--')]
63-
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
64-
else:
65-
display_key = canonical_key
66-
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
67-
else:
68-
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
69-
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
70-
warn(msg) ; warned_set.add(flag)
71-
7249
def cmd_docs_url_exit(cli: sn, msg: str = '', cmd: str = 'help') -> None:
7350
if msg : error(msg)
7451
help_cmd(cli) if cmd == 'help' else init_cmd(cli)
@@ -110,3 +87,26 @@ def trunc(msg: str, end: str = '\n') -> None:
11087
truncated_lines = [
11188
line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]
11289
print('\n'.join(truncated_lines), end=end)
90+
91+
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
92+
from . import settings
93+
warned_set = _warned_keys[source]
94+
if flag in warned_set : return
95+
canonical_key = settings.get_canonical_key(flag)
96+
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
97+
if canonical_key:
98+
canonical_ctrl = getattr(settings.controls, canonical_key, None)
99+
if source == 'cli' and canonical_ctrl:
100+
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
101+
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
102+
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
103+
else: # show long flag replacement
104+
long_flags = [flag for flag in flags if flag.startswith('--')]
105+
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
106+
else:
107+
display_key = canonical_key
108+
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
109+
else:
110+
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
111+
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
112+
warn(msg) ; warned_set.add(flag)

‎translate-messages/src/translate_messages/lib/log.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,6 @@ def version(cli: sn) -> None:
4646
print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION.lower()}: {cli.version}{colors.nc}')
4747
def warn(msg: str, *args, **kwargs) -> None : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
4848

49-
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
50-
from . import settings
51-
warned_set = _warned_keys[source]
52-
if flag in warned_set : return
53-
canonical_key = settings.get_canonical_key(flag)
54-
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
55-
if canonical_key:
56-
canonical_ctrl = getattr(settings.controls, canonical_key, None)
57-
if source == 'cli' and canonical_ctrl:
58-
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
59-
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
60-
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
61-
else: # show long flag replacement
62-
long_flags = [flag for flag in flags if flag.startswith('--')]
63-
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
64-
else:
65-
display_key = canonical_key
66-
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
67-
else:
68-
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
69-
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
70-
warn(msg) ; warned_set.add(flag)
71-
7249
def cmd_docs_url_exit(cli: sn, msg: str = '', cmd: str = 'help') -> None:
7350
if msg : error(msg)
7451
help_cmd(cli) if cmd == 'help' else init_cmd(cli)
@@ -112,3 +89,26 @@ def trunc(msg: str, end: str = '\n') -> None:
11289
truncated_lines = [
11390
line if len(line) < terminal_width else line[:terminal_width -4] + '...' for line in msg.splitlines()]
11491
print('\n'.join(truncated_lines), end=end)
92+
93+
def warn_legacy_option(cli: sn, flag: str, source: str) -> None:
94+
from . import settings
95+
warned_set = _warned_keys[source]
96+
if flag in warned_set : return
97+
canonical_key = settings.get_canonical_key(flag)
98+
msg = f"{ cli.msgs.warn_CONFIG_FILE_KEY if source == 'config' else cli.msgs.warn_CLI_OPTION } {flag!r}"
99+
if canonical_key:
100+
canonical_ctrl = getattr(settings.controls, canonical_key, None)
101+
if source == 'cli' and canonical_ctrl:
102+
flags = [arg for arg in getattr(canonical_ctrl, 'args', []) if arg.startswith('-')]
103+
if flag.startswith('-') and len(flag) == 2: # show short flag replacement
104+
display_key = min(flags, key=len) if flags else f"--{canonical_key.replace('_', '-')}"
105+
else: # show long flag replacement
106+
long_flags = [flag for flag in flags if flag.startswith('--')]
107+
display_key = long_flags[0] if long_flags else f"--{canonical_key.replace('_', '-')}"
108+
else:
109+
display_key = canonical_key
110+
msg += f' {cli.msgs.warn_HAS_BEEN_REPLACED_BY} {display_key!r}'
111+
else:
112+
msg += f' {cli.msgs.warn_NO_LONGER_HAS_ANY_EFFECT}'
113+
msg += f' {cli.msgs.warn_AND_WILL_BE_REMOVED} @ v{next_maj_ver}'
114+
warn(msg) ; warned_set.add(flag)

0 commit comments

Comments
 (0)