Merge remote-tracking branch 'origin/master' into develop

Author: qmk-bot

lib/python/qmk/cli/generate/config_h.py

@@ -95,7 +95,7 @@ def generate_config_items(kb_info_json, config_h_lines):
 
         try:
             config_value = kb_info_json[info_key]
-        except KeyError, IndexError:
+        except (KeyError, IndexError):
             continue
 
         if key_type.startswith('array.array'):

lib/python/qmk/cli/generate/rules_mk.py

@@ -31,7 +31,7 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict):
 
     try:
         rules_value = kb_info_json[info_key]
-    except KeyError, IndexError:
+    except (KeyError, IndexError):
         return None
 
     if key_type in ['array', 'list']: