Remove __package__ setting and import code in test_gnupg.py.

* FIXES bug which caused py3k tests to fail to run.
fix/24-enc-to-file
Isis Lovecruft 2013-07-31 22:23:30 +00:00
parent 08f066ddfc
commit 8cccef433d
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 6 additions and 17 deletions

View File

@ -57,23 +57,12 @@ import gnupg
## see PEP-366 http://www.python.org/dev/peps/pep-0366/ ## see PEP-366 http://www.python.org/dev/peps/pep-0366/
print("NAME: %r" % __name__) print("NAME: %r" % __name__)
print("PACKAGE: %r" % __package__) print("PACKAGE: %r" % __package__)
if __name__ == "__main__" and __package__ is None: try:
__package__ = "gnupg.test" import gnupg._util as _util
print("NAME: %r" % __name__) import gnupg._parsers as _parsers
print("PACKAGE: %r" % __package__) import gnupg._logger as _logger
try: except (ImportError, ValueError) as ierr:
from .. import _util raise SystemExit(ierr.message)
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)
log = _util.log log = _util.log