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

gnupg/_parsers.py

@@ -24,7 +24,14 @@ options.
 from __future__ import absolute_import
 from __future__ import print_function
 
-import collections
+try:
+    # py2.7+ comes with collections.OrderedDict
+    from collections import OrderedDict
+except ImportError:
+    # py2.6 doesn't; this is an equivalent;
+    # `pip install ordereddict`
+    from ordereddict import OrderedDict
+
 import re
 
 from .      import _util
@@ -1022,7 +1029,7 @@ class ImportResult(object):
     _fields = '''count no_user_id imported imported_rsa unchanged
     n_uids n_subk n_sigs n_revoc sec_read sec_imported sec_dups
     not_imported'''.split()
-    _counts = collections.OrderedDict(
+    _counts = OrderedDict(
         zip(_fields, [int(0) for x in range(len(_fields))]) )
 
     #: A list of strings containing the fingerprints of the GnuPG keyIDs