From 0d88a282eea499917bffa64ead0f28fcca2bb2e6 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 29 Dec 2013 01:56:25 +0100 Subject: [PATCH] fix import of OrderedDict --- gnupg/_parsers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnupg/_parsers.py b/gnupg/_parsers.py index 58a681c..dc4d3ae 100644 --- a/gnupg/_parsers.py +++ b/gnupg/_parsers.py @@ -25,9 +25,9 @@ from __future__ import absolute_import from __future__ import print_function try: - import collections + from collections import OrderedDict except ImportError: - import ordereddict as collections + from ordereddict import OrderedDict import re @@ -1027,7 +1027,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