Merge remote-tracking branch 'kalikaneko/doc-fixes' into develop

fix/24-output-to-filename
Isis Lovecruft 2014-08-01 23:59:33 +00:00
commit 285649cfa0
No known key found for this signature in database
GPG Key ID: 5C17776E27F7E84D
3 changed files with 10 additions and 8 deletions

2
.gitignore vendored
View File

@ -38,6 +38,8 @@ nosetests.xml
.\#* .\#*
\#*\# \#*\#
*~ *~
*.swp
*.swo
# tags # tags
TAGS TAGS

13
README
View File

@ -36,19 +36,18 @@ and import the module like so:
The primary interface class you'll likely want to interact with is The primary interface class you'll likely want to interact with is
[```gnupg.GPG```](https://python-gnupg.readthedocs.org/en/latest/gnupg.html#gpg): [```gnupg.GPG```](https://python-gnupg.readthedocs.org/en/latest/gnupg.html#gpg):
``` ```
>>> gpg = gnupg.GPG(gpgbinary='/usr/bin/gpg', >>> gpg = gnupg.GPG(binary='/usr/bin/gpg',
... gpghome='./keys', ... homedir='./keys',
... pubring='pubring.gpg', ... keyring='pubring.gpg',
... secring='secring.gpg') ... secring='secring.gpg')
>>> batch_key_input = gpg.gen_key_input() >>> batch_key_input = gpg.gen_key_input(
... key_type='RSA',
... key_length=4096)
>>> print batch_key_input >>> print batch_key_input
Key-Type: RSA Key-Type: RSA
Name-Email: isis@wintermute Name-Email: isis@wintermute
Name-Comment: Generated by gnupg.py
Key-Length: 4096 Key-Length: 4096
Name-Real: Autogenerated Key Name-Real: Autogenerated Key
%pubring /home/isis/code/python-gnupg/keys/pubring.gpg
%secring /home/isis/code/python-gnupg/keys/secring.gpg
%commit %commit
>>> key = gpg.gen_key(batch_key_input) >>> key = gpg.gen_key(batch_key_input)

View File

@ -12,9 +12,10 @@ from __future__ import print_function
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
import os
import logging import logging
import gnupg import gnupg
import sys
from gnupg import _logger from gnupg import _logger