combine branches for OrderedDict and dict

dwiel · dwiel · commit 2cbe47f4812e · 2014-02-10T13:06:27.000-05:00
diff --git a/tabulate.py b/tabulate.py
@@ -4,7 +4,7 @@
 
 from __future__ import print_function
 from __future__ import unicode_literals
-from collections import namedtuple, OrderedDict
+from collections import namedtuple
 from platform import python_version_tuple
 import re
 
@@ -521,8 +521,8 @@ def _normalize_tabular_data(tabular_data, headers):
               and hasattr(rows[0], "_fields")): # namedtuple
             headers = list(map(_text_type, rows[0]._fields))
         elif (len(rows) > 0
-              and isinstance(rows[0], OrderedDict)):
-              # OrderedDict
+              and isinstance(rows[0], dict)):
+              # works for dict and OrderedDict
             mmap = {} # implements hashed lookup
             keys = [] # storage for set
             for row in rows :
@@ -535,16 +535,6 @@ def _normalize_tabular_data(tabular_data, headers):
             rows = [[row.get(k) for k in keys] for row in rows]
             if headers == 'keys' :
                 headers = keys
-        elif (len(rows) > 0
-              and isinstance(rows[0], dict)):
-              # dict
-            keys = set()
-            for row in rows :
-                keys.update(row.keys())
-            keys = list(map(_text_type, keys))
-            rows = [[row.get(k) for k in keys] for row in rows]
-            if headers == 'keys' :
-                headers = keys
         elif headers == "keys" and len(rows) > 0:  # keys are column indices
             headers = list(map(_text_type, range(len(rows[0]))))
 
