bpo-29957: change LBYL key lookup to dict.setdefault (#938)

selik · benjaminp · commit 11fa3c7cd1b1 · 2017-04-01T23:02:31.000-07:00
* change LBYL key lookup to dict.setdefault

The ``results`` was constructed as a defaultdict and we could simply
delete the check ``if key not in results``. However, I think it's safer
to use dict.setdefault as I'm not sure whether the caller expects a
regular dict or defaultdict.

* add name to the acknowledgements file

* use defaultdict to make the key-lookup cleaner
diff --git a/Lib/lib2to3/btm_matcher.py b/Lib/lib2to3/btm_matcher.py
@@ -117,10 +117,7 @@ def run(self, leaves):
                     #token matches
                     current_ac_node = current_ac_node.transition_table[node_token]
                     for fixer in current_ac_node.fixers:
-                        if not fixer in results:
-                            results[fixer] = []
                         results[fixer].append(current_ast_node)
-
                 else:
                     #matching failed, reset automaton
                     current_ac_node = self.root
@@ -134,8 +131,6 @@ def run(self, leaves):
                         #token matches
                         current_ac_node = current_ac_node.transition_table[node_token]
                         for fixer in current_ac_node.fixers:
-                            if not fixer in results.keys():
-                                results[fixer] = []
                             results[fixer].append(current_ast_node)
 
                 current_ast_node = current_ast_node.parent
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1376,6 +1376,7 @@ Steven Scott
 Nick Seidenman
 Michael Seifert
 Žiga Seilnacht
+Michael Selik
 Yury Selivanov
 Fred Sells
 Jiwon Seo
