From a228c91fa74714f317fc5336a148a2da537fab24 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Thu, 7 Mar 2013 04:12:51 +0000 Subject: [PATCH] Fix variable names in assertions in GPG.__init__(). --- gnupg.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnupg.py b/gnupg.py index 0ff9fa9..ce0d6c5 100644 --- a/gnupg.py +++ b/gnupg.py @@ -984,15 +984,16 @@ class GPG(object): self.gpgbinary = safe_gpgbinary assert self.gpgbinary, "Could not find gpgbinary %s" % safe_gpgbinary - safe_gpghome = _fix_unsafe(gpghome) - self.gpghome = safe_gpghome - if not os.path.isdir(self.gpghome): - os.makedirs(self.gpghome, 0x1C0) - assert _has_readwrite(safe_gpghome), "Need read+write: %s" % safe_gpghome + self.gpghome = _fix_unsafe(safe_gpghome) + if self.gpghome is not None: + if not os.path.isdir(self.gpghome): + os.makedirs(self.gpghome, 0x1C0) + assert _has_readwrite(self.gpghome), \ + "Need read+write for GnuPG home directory: %s" % self.gpghome - safe_keyring = _fix_unsafe(keyring) - self.keyring = safe_keyring - assert _is_file(self.keyring), "Could not find %s" % safe_keyring + self.keyring = _fix_unsafe(safe_keyring) + if self.keyring is not None: + assert _is_file(self.keyring), "Could not find %s" % self.keyring assert isinstance(verbose, bool), "'verbose' must be boolean" self.verbose = verbose