Commit Graph

880 Commits (1ea44e81af749890d32db366fd9dff734e89a5d1)

Author SHA1 Message Date
Isis Lovecruft 1ea44e81af
Merge branch 'release/1.2.6' 2014-06-04 21:11:13 +00:00
Isis Lovecruft ebd93db8c2
Merge remote-tracking branch 'zigg/fix/py3k-tests' into develop 2014-06-04 20:30:44 +00:00
Isis Lovecruft a508005d77
Merge remote-tracking branch 'ttanner/fix/default_key' into develop 2014-06-04 19:17:10 +00:00
Isis Lovecruft fde37b542a
Merge remote-tracking branch 'ttanner/fix/ordered2.6' into develop 2014-06-04 19:09:02 +00:00
Thomas Tanner 1fd400b5d3 more py2.6 fixes 2014-04-23 14:49:24 +02:00
Thomas Tanner 6b7fe3467d py2.6 support for testing 2014-04-23 14:06:30 +02:00
Matt Behrens e87e67cf15 more tests for #16. all now pass except one 2014-03-31 11:32:35 -04:00
Matt Behrens 3be2697a1b WIP fixing serveral Python 3 tests for #16 2014-03-30 19:53:45 -04:00
Matt Behrens 929fad0a1a prune unused exceptions imports for Python 3 2014-03-26 22:33:03 -04:00
Isis Lovecruft d94688fa30
Merge branch 'feature/8192-bit-key-example' into develop 2014-01-06 14:37:31 +00:00
Isis Lovecruft bc2a21d31c
Add example script which creates an 8192-bit key with 4096-bit subkey. 2014-01-05 20:10:23 +00:00
Isis Lovecruft 64fc3bc66f
Add 8192-bit-key/* to .gitignore. 2014-01-05 20:00:30 +00:00
Thomas Tanner 0d88a282ee fix import of OrderedDict 2013-12-29 01:56:25 +01:00
Isis Lovecruft a2abeff818
Merge branch 'master' into develop 2013-12-04 11:46:10 +00:00
Isis Lovecruft 3cdfbc2f9b
Merge branch 'release/1.2.5' 2013-12-04 11:45:46 +00:00
Isis Lovecruft 7bf4246c17
Fix setup.cfg 'upload_all' alias. 2013-12-04 11:34:49 +00:00
Isis Lovecruft 425d116ae0
Rewrite verification unittests to use correct parameters 2013-12-04 10:16:04 +00:00
Isis Lovecruft 56fab92b48
Fix issue with detached sig verification not writing verify output.
In the method `gnupg.GPG.verify_file()`, the `writer` was improperly
initialised: `_util._threaded_copy_data` was being given a filename when
it expects an open `file` object which it can read() from. Additionally,
the `writer` parameter was missing from the call to
`gnupg.GPG._collect_output()`, so even if it had been properly
initialised, the output would not have been written to the stdin of the
thread GnuPG was being called within.
2013-12-04 10:10:18 +00:00
Isis Lovecruft f5b345b1ae
Refactor _util._is_file to handle detached sigs and data on stdin.
When gnupg.GPG.verify_file() was changed recently to take the filename
of the signature file as an argument to GnuPG, and then take the data
file to be verified on stdin, the parser in _parsers._check_options()
would call _util._is_file(), which would return False and log an error
that "'-' is not a file!". This fixes that issue by catching OSError and
treating it differently.

Additionally, I renamed the _util._is_file() parameter
`input`→`filename` to avoid overriding a builtin method.

I also replaced the `assert` lines with explicit checks, because
`assert`s are stripped out when the Python interpreter is run with -OO.

 * FIXES an issue with verification of detached signatures whose
   datafiles are read from stdin.
2013-12-04 10:02:08 +00:00
Isis Lovecruft b90d3b6414
Clarify a bit of and/or logic in _parsers._check_options(). 2013-12-04 10:01:05 +00:00
Isis Lovecruft af93c4caaf
Remove unicode characters preventing manpage and LaTeX Sphinx builds. 2013-12-04 08:48:56 +00:00
Isis Lovecruft 48a43435f0
Update setup.py docs requires: repoze.sphinx → sphinxcontrib-fulltoc. 2013-12-04 00:35:28 +00:00
Isis Lovecruft 0a13554d92
Remove dependency_link print statements from setup.py. 2013-12-04 00:34:32 +00:00
Isis Lovecruft cc59df2ca3
Check for Py2.6 in setup.py; then add ordereddict to install_requires. 2013-12-04 00:31:41 +00:00
Isis Lovecruft 27cab9651e
Merge remote-tracking branch 'drpoovilleorg/master' into develop 2013-12-04 00:07:57 +00:00
Isis Lovecruft c4313fc1a8 Merge remote-tracking branch 'ttanner/fix/noprint' into develop 2013-12-03 22:57:18 +00:00
Isis Lovecruft 97933ebb07
Get rid of the annoying "GnuPG logging disabled..." print statement. 2013-12-03 22:35:38 +00:00
Isis Lovecruft 641f503f4a
Cleanup docstrings in gnupg.py. 2013-12-03 22:35:17 +00:00
Isis Lovecruft 04b9a13a51
Cleanup docstrings in _util.py. 2013-12-03 22:27:11 +00:00
Isis Lovecruft 82cdfaf45e
Cleanup Sphinx directives in docstrings in _parsers.py. 2013-12-03 22:26:26 +00:00
Isis Lovecruft 4f2dc555a5
Cleanup Sphinx directives in _meta.py. 2013-12-03 22:25:16 +00:00
Isis Lovecruft 9d75e0f01b
Cleanup Sphinx directives in docstrings in _trust.py. 2013-12-03 22:23:44 +00:00
Isis Lovecruft 3c155e1511
Fix the rst table of logging level names and values. 2013-12-03 22:22:10 +00:00
Isis Lovecruft f38caae84d
Remove duplicate headings from module docstrings. 2013-12-03 22:21:36 +00:00
Isis Lovecruft cfff8aaba8
Fix blockquotes of previous documentation in gnupg.rst. 2013-12-03 22:00:09 +00:00
Isis Lovecruft 87b8c97a34
Fix a couple refs pointing to the wrong classes in docs/gnupg.rst. 2013-12-03 21:59:50 +00:00
Isis Lovecruft 9a4f9c2f9a
Don't document special attributes in _meta twice. 2013-12-03 21:56:59 +00:00
Isis Lovecruft 8dda32636f
Add reference Sphinx directives for module sections in docs. 2013-12-03 21:55:57 +00:00
Isis Lovecruft 15d5635ea4
Disable Sphinx prefixing with full module names. 2013-12-03 21:55:08 +00:00
Isis Lovecruft 91ef911862
Specify Sphinx source encoding explicitly. 2013-12-03 21:54:29 +00:00
Isis Lovecruft 0f611c3c13
Add intersphinx mapping to docs.python.org. 2013-12-03 21:53:54 +00:00
Isis Lovecruft 66c3a1b693
Update Sphinx version requirement. 2013-12-03 21:53:12 +00:00
Isis Lovecruft 638d639558
Add options to Sphinx conf.py for -Wall and rebuild environment. 2013-12-03 21:51:09 +00:00
Isis Lovecruft 7d7dec5d9f
Make doc html head font easier to read. 2013-12-03 21:49:46 +00:00
Isis Lovecruft 0e6171a4af
Move DETAILS.html into _static/ so that the documentation can link to it. 2013-12-03 21:47:39 +00:00
Isis Lovecruft 6cf7e0fe61
Revert "remove docs/_static folder."
This reverts commit e5351cfe95.

As mentioned on the issue tracker, [0] some of the CSS from docs/_static was
still required to make the layout of the Sphinx generated output have the
correct layout. I reverted the last commit, which removed the whole
docs/_static directory, and then removed all the JavaScript and the unneeded
CSS. Hopefully, this is okay with Debian. :)

[0]: https://github.com/isislovecruft/python-gnupg/pull/27#issuecomment-29712108
2013-12-03 21:42:46 +00:00
Isis Lovecruft e9b422ec58
Merge remote-tracking branch 'kalikaneko/bug/fix-sphinx-build' into develop 2013-12-03 13:52:23 +00:00
Isis Lovecruft dd9adb8f7a
Add upload_all setup.cfg alias. 2013-12-03 11:37:32 +00:00
Isis Lovecruft ffb1aeace5
Merge branch 'master' into develop 2013-12-03 11:36:59 +00:00
Isis Lovecruft 7b2c5dc9db
Merge branch 'release/1.2.4' 2013-12-03 11:36:33 +00:00