From 3038e3948be8a2b68f32b9f7ea2928c1fbfde6a0 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Fri, 17 May 2013 01:13:02 +0000
Subject: [PATCH] Remove relative imports of every class in parsers.py, they
 crowd the namespace.

---
 src/__init__.py |  2 --
 src/gnupg.py    | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/__init__.py b/src/__init__.py
index 0294ac0..b565e07 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,7 +1,5 @@
 
 import gnupg
-from parsers import Crypt, DeleteResult, ListKeys
-from parsers import GenKey, Sign, ImportResult, Verify
 import copyleft
 
 from gnupg import GPG
diff --git a/src/gnupg.py b/src/gnupg.py
index 0b4a29e..1495537 100644
--- a/src/gnupg.py
+++ b/src/gnupg.py
@@ -95,12 +95,11 @@ import sys
 import tempfile
 import threading
 
-from parsers import Verify, Crypt, DeleteResult, ImportResult
-from parsers import GenKey, Sign, ListKeys, ListPackets
-from parsers import _fix_unsafe, _sanitise, _is_allowed, _sanitise_list
-from parsers import _check_preferences
 from util    import logger, _conf
 
+import parsers
+
+
 import util as _util
 
 
@@ -108,13 +107,14 @@ class GPG(object):
     """Encapsulate access to the gpg executable"""
     _decode_errors = 'strict'
 
-    _result_map = {'crypt': Crypt,
-                   'delete': DeleteResult,
-                   'generate': GenKey,
-                   'import': ImportResult,
-                   'list': ListKeys,
-                   'sign': Sign,
-                   'verify': Verify,}
+    _result_map    = { 'crypt':    parsers.Crypt,
+                       'delete':   parsers.DeleteResult,
+                       'generate': parsers.GenKey,
+                       'import':   parsers.ImportResult,
+                       'list':     parsers.ListKeys,
+                       'sign':     parsers.Sign,
+                       'verify':   parsers.Verify,
+                       'packets':  parsers.ListPackets }
 
     def __init__(self, binary=None, homedir=None, verbose=False,
                  use_agent=False, keyring=None, secring=None,