Fix commandline parsing and flake8 findings, rebase

Fixed commandline and config parsing. Thx @xplusplus.
Rebased on master and fixed merge conflicts.

1 files changed, 1 insertions, 2 deletions

diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index 113b885de..afb001f3e 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -1,11 +1,9 @@
 """Functions that help you work with QMK keymaps.
 """
 import os
-from traceback import format_exc
 
 import qmk.path
 import qmk.makefile
-from qmk.errors import NoSuchKeyboardError
 
 # The `keymap.c` template to use when a keyboard doesn't have its own
 DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H
@@ -98,6 +96,7 @@ def write(keyboard, keymap, layout, layers):
 
     return keymap_file
 
+
 def list_keymaps(keyboard_name):
     """ List the available keymaps for a keyboard.