From 8cccef433db57c3c8653b18ee2d68744a0746572 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Wed, 31 Jul 2013 22:23:30 +0000
Subject: [PATCH] Remove __package__ setting and import code in test_gnupg.py.

 * FIXES bug which caused py3k tests to fail to run.
---
 gnupg/test/test_gnupg.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/gnupg/test/test_gnupg.py b/gnupg/test/test_gnupg.py
index e522121..a0df84b 100644
--- a/gnupg/test/test_gnupg.py
+++ b/gnupg/test/test_gnupg.py
@@ -57,23 +57,12 @@ import gnupg
 ## see PEP-366 http://www.python.org/dev/peps/pep-0366/
 print("NAME: %r" % __name__)
 print("PACKAGE: %r" % __package__)
-if __name__ == "__main__" and __package__ is None:
-    __package__ = "gnupg.test"
-    print("NAME: %r" % __name__)
-    print("PACKAGE: %r" % __package__)
-    try:
-        from .. import _util
-        from .. import _parsers
-        from .. import _logger
-    except (ImportError, ValueError) as ierr:
-        print(ierr.message)
-else:
-    try:
-        import gnupg._util    as _util
-        import gnupg._parsers as _parsers
-        import gnupg._logger  as _logger
-    except (ImportError, ValueError) as ierr:
-        raise SystemExit(ierr.message)
+try:
+    import gnupg._util    as _util
+    import gnupg._parsers as _parsers
+    import gnupg._logger  as _logger
+except (ImportError, ValueError) as ierr:
+    raise SystemExit(ierr.message)
 
 
 log = _util.log