Merge remote-tracking branch 'kalikaneko/feature/expand-homedir' into develop

2014-09-24 19:49:34 +00:00 · 2014-09-24 19:49:34 +00:00 · 728b5c8ec9
parent 042550d151 bde27abcf2
commit 728b5c8ec9
1 changed files with 1 additions and 1 deletions
--- a/gnupg/_meta.py
+++ b/gnupg/_meta.py
@ -135,7 +135,7 @@ class GPGBase(object):
                           file for secret keys.
        """
        self.binary  = _util._find_binary(binary)
-        self.homedir = home if home else _util._conf
+        self.homedir = os.path.expanduser(home) if home else _util._conf
        pub = _parsers._fix_unsafe(keyring) if keyring else 'pubring.gpg'
        sec = _parsers._fix_unsafe(secring) if secring else 'secring.gpg'
        self.keyring = os.path.join(self._homedir, pub)