Raise a DeprecationWarning for GPG argument 'keyring'.

feature/documentation-builds-html
Isis Lovecruft 2013-04-15 00:47:16 +00:00
parent 5f96682378
commit 25a10567d0
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 1 additions and 8 deletions

View File

@ -250,17 +250,10 @@ class GPG(object):
self.gpgbinary = util._find_gpgbinary(gpgbinary)
if keyring is not None:
try:
raise DeprecationWarning(
"Option 'keyring' changing to 'secring'")
except DeprecationWarning as dw:
log.warn(dw.message)
finally:
pubring = keyring
raise DeprecationWarning("Option 'keyring' changing to 'secring'")
secring = 'secring.gpg' if secring is None else _fix_unsafe(secring)
pubring = 'pubring.gpg' if pubring is None else _fix_unsafe(pubring)
self.secring = os.path.join(self.gpghome, secring)
self.pubring = os.path.join(self.gpghome, pubring)
## XXX should eventually be changed throughout to 'secring', but until