Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 212e185b62 | |||
| b7d0a65bdf | |||
| 221d42fec1 | |||
| f3e83794c9 | |||
| 73628cc6b0 |
@@ -39,7 +39,7 @@ import colorama
|
|||||||
from appdirs import user_config_dir
|
from appdirs import user_config_dir
|
||||||
|
|
||||||
# Disable logging until we can configure it how the user wants
|
# Disable logging until we can configure it how the user wants
|
||||||
logging.basicConfig(filename='/dev/null')
|
logging.basicConfig(stream=os.devnull)
|
||||||
|
|
||||||
# Log Level Representations
|
# Log Level Representations
|
||||||
EMOJI_LOGLEVELS = {
|
EMOJI_LOGLEVELS = {
|
||||||
@@ -180,13 +180,13 @@ class ConfigurationSection(Configuration):
|
|||||||
self.parent = parent
|
self.parent = parent
|
||||||
|
|
||||||
def __getitem__(self, key):
|
def __getitem__(self, key):
|
||||||
"""Returns a config value, pulling from the `default` section as a fallback.
|
"""Returns a config value, pulling from the `user` section as a fallback.
|
||||||
"""
|
"""
|
||||||
if key in self._config:
|
if key in self._config:
|
||||||
return self._config[key]
|
return self._config[key]
|
||||||
|
|
||||||
elif key in self.parent.default:
|
elif key in self.parent.user:
|
||||||
return self.parent.default[key]
|
return self.parent.user[key]
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -429,11 +429,12 @@ class MILC(object):
|
|||||||
self.arg_only.append(arg_name)
|
self.arg_only.append(arg_name)
|
||||||
del kwargs['arg_only']
|
del kwargs['arg_only']
|
||||||
|
|
||||||
|
name = handler.__name__.replace("_", "-")
|
||||||
if handler is self._entrypoint:
|
if handler is self._entrypoint:
|
||||||
self.add_argument(*args, **kwargs)
|
self.add_argument(*args, **kwargs)
|
||||||
|
|
||||||
elif handler.__name__ in self.subcommands:
|
elif name in self.subcommands:
|
||||||
self.subcommands[handler.__name__].add_argument(*args, **kwargs)
|
self.subcommands[name].add_argument(*args, **kwargs)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise RuntimeError('Decorated function is not entrypoint or subcommand!')
|
raise RuntimeError('Decorated function is not entrypoint or subcommand!')
|
||||||
@@ -599,7 +600,7 @@ class MILC(object):
|
|||||||
self.add_subparsers()
|
self.add_subparsers()
|
||||||
|
|
||||||
if not name:
|
if not name:
|
||||||
name = handler.__name__
|
name = handler.__name__.replace("_", "-")
|
||||||
|
|
||||||
self.acquire_lock()
|
self.acquire_lock()
|
||||||
kwargs['help'] = description
|
kwargs['help'] = description
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
"""A program to help you work with qmk_firmware."""
|
"""A program to help you work with qmk_firmware."""
|
||||||
|
|
||||||
__version__ = '0.0.15'
|
__version__ = '0.0.17'
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ def in_qmk_firmware():
|
|||||||
while len(cur_dir.parents) > 0:
|
while len(cur_dir.parents) > 0:
|
||||||
found_bin = cur_dir / 'bin' / 'qmk'
|
found_bin = cur_dir / 'bin' / 'qmk'
|
||||||
if found_bin.is_file():
|
if found_bin.is_file():
|
||||||
command = [found_bin, '--version']
|
command = [found_bin.as_posix(), '--version']
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
|
|||||||
Reference in New Issue
Block a user