Commit Graph

736 Commits (1ca57e7aa25e82f7788ad15cf30fbc0443a548cf)

Author SHA1 Message Date
Isis Lovecruft ea8c2c5e1f
Ugh. Change the unittest paths again. 2013-07-02 07:14:21 +00:00
Isis Lovecruft f2cfd3f04b
Merge branch 'develop' into feature/module-layout
Conflicts:
	gnupg/_parsers.py
2013-07-02 01:26:35 +00:00
Isis Lovecruft 311a90cb33
Merge branch 'master' into develop 2013-07-02 01:12:43 +00:00
Isis Lovecruft 9c770cbc39
Merge branch 'release/1.0.2' 2013-07-02 01:12:05 +00:00
Isis Lovecruft dc1e54a4ed
Merge remote-tracking branch 'tomgalloway/develop' into develop 2013-07-02 01:04:45 +00:00
Isis Lovecruft e8062c95aa
Fix variable names in unittest: pubring→keyring. 2013-07-02 00:55:53 +00:00
Isis Lovecruft e18e10edd1
Add a debug statement to a unittest when we've downloaded a key. 2013-07-02 00:55:26 +00:00
Isis Lovecruft 61b27bcd3b
Ignore additions to gnupg/tests/files/ directory. 2013-07-02 00:54:05 +00:00
Isis Lovecruft 3b7457ae74
Remove a print statement from a unittest. 2013-07-02 00:43:54 +00:00
Isis Lovecruft 6cf7640c5c
Fix whitespace formatting for a line in gnupg/tests/test_gnupg.py. 2013-07-02 00:43:12 +00:00
Isis Lovecruft 12b1de719a
Update paths in unittests to disregard the installed directory. 2013-07-02 00:42:17 +00:00
Isis Lovecruft 8e2773207b
Ignore setup.cfg maintainer upload configuration file. 2013-07-02 00:36:48 +00:00
Isis Lovecruft 26bd9e2585
Merge branch 'develop' into feature/module-layout 2013-06-28 13:17:24 +00:00
Isis Lovecruft 67e823dbf1
Add repoze.sphinx to docs dependency 'extras_require' setting in setup.py. 2013-06-28 13:14:43 +00:00
Isis Lovecruft 8d39234889
Add test logs and files to gitignore. 2013-06-28 13:14:29 +00:00
Isis Lovecruft d7a0ffb395
Move tests/* → gnupg/test/* 2013-06-28 13:13:27 +00:00
Tom Galloway 6d08fe074a Clean up tabs. 2013-06-28 13:25:23 +01:00
Tom Galloway c10df26d0b Upstream issue #62 also handled KEYREVOKED status. Changes reflect this. 2013-06-28 13:20:39 +01:00
Isis Lovecruft 220e68bdfc
Change unittest for separate keyrings to add extra --keyring option for now.
* At some point, as mentioned in an earlier commit, we should actually make
   some sort of helper function for adding extra keyring, so that their keys
   can be used/imported/exported/whatever the user wants to do with them,
   without changing the normal main keyrings.
2013-06-28 07:27:57 +00:00
Isis Lovecruft 1780c7489a
Change the _generated_keys directory for unittests to be under tests/files/. 2013-06-28 07:27:07 +00:00
Isis Lovecruft ad5c282e9a
Change setup.py to rename the package from 'python-gnupg' to 'gnupg'.
* To import, the same 'import gnupg; gpg=gnupg.GPG' is still used, so this
   changes nothing for applications which have started using this fork.

 * This name appears to be untaken on PyPI, the changes I've made thus far are
   significant, and, I believe, are not entirely backwards compatible with
   upstream, do to various keyword argument and method renamings and such.

 * Upstream is unresponsive, their development is private, and the only way to
   get their code is to download an entire tarball and do a diff, since no
   public CVS is available. Also, looking at their recent releases in the past
   five months, they appear to be fixing bugs I've already fixed, albeit in
   different ways -- and not all of the bugs I've fixed, as the shell escape
   trick still works in upstream's 0.3.4 version -- which leads me to believe
   that they are generally oblivious to this fork, though I have tried to
   contact them several times.

 * At first, I merely bumped the major version number up to indicate the
   incompatibility, but in order to upload to PyPI it would need a different
   name, and so I might as well pick a new one and just go with it, in order
   to avoid the general confusion which might result from keeping the name
   'python-gnupg'.
2013-06-28 07:17:12 +00:00
Isis Lovecruft f11ea6901c
Set gpg.temp_[key|sec]ring to None after setting key.[key|sec]ring.
* Change the returned _parsers.GenKey from gnupg.GPG.gen_key() to store the
   location of the renamed temporary keyrings as attributes. This way, one can
   do something like:

   >>> key = gpg.gen_key(key_input)
   >>> key.keyring
   './generated-keys/328A5C6C1B2F0891125ECBE4624276B5A2296478.pubring.gpg'
2013-06-28 07:09:35 +00:00
Isis Lovecruft 8232f14f2a
Remove commented out code from GPG.gen_key() for import after generation.
* Generated keys in separate keyring would not be available after switching
   back to the normal keyrings (not the ones set up for key generation), so at
   first in the unittests I imported them back into the main keyrings… this,
   however, is would be stupid, as in nullifies half the reasons for using
   separate keyrings in the first place, thus the code was commented out. Now
   that the temporary keyrings are placed in the gnupg.GPG._generated_keys
   directory, it would be nice to eventually either extend GPG.import_keys()
   or add a new helper function for doing:

       $ gpg --no-default-keyring --keyring pubring.gpg \
            --keyring ./generated-keys/<some_fingerprint>.gpg
2013-06-28 06:44:52 +00:00
Isis Lovecruft 9008faa0db
Fix a misnamed variable in gnupg.py; self._key_dir→self._keys_dir 2013-06-28 06:42:42 +00:00
Isis Lovecruft 603379eb37
Change _copy_data() error handling to explain errors not due to broken pipes. 2013-06-28 06:40:09 +00:00
Isis Lovecruft 328e8fcbe0
Add a 'generated-keys' subdirectory to gnupg.GPG.homedir.
* Add GPG._generated_keys as an _utils.InheritableProperty class for storing
   a configurable (even by subclasses of GPGBase, without property overrides)
   subdirectory of whichever directory gnupg.GPG.homedir is set to. This
   subdirectory can be used via the 'separate_keyring=True' option to
   gnupg.GPG.gen_key_input(), which will switch temporarily to new pubring.gpg
   and secring.gpg keyrings during key creation, and upon finishing creation
   of the new key, will ask for the new key's fingerprint, and move the
   keyrings into this GPG._generated_keys directory, renamed in the format
   "<GPG.homedir>/<GPG._generated_keys>/<fingerprint>.[pub|sec]ring.gpg".
2013-06-28 06:29:38 +00:00
Isis Lovecruft ca1acaf7e6
Merge branch 'master' into develop 2013-06-28 02:47:15 +00:00
Isis Lovecruft 906cbd2305
Merge branch 'release/1.0.1' 2013-06-28 02:41:19 +00:00
Isis Lovecruft 45d714a73a Fix upstream issue #62, handle expired keys.
* see https://code.google.com/p/python-gnupg/issues/detail?id=62
2013-06-28 02:38:27 +00:00
Isis Lovecruft 9d5cdb8854
Fix upstream issue #62, handle expired keys.
* see https://code.google.com/p/python-gnupg/issues/detail?id=62
2013-06-28 02:31:37 +00:00
Isis Lovecruft d129ed5b17
Add _parsers.GenKey.secring and _parsers.GenKey.keyring attributes and docs. 2013-06-28 02:30:57 +00:00
Isis Lovecruft f996bf9e31
Update _parsers._sanitise_list() documentation. 2013-06-28 02:30:20 +00:00
Isis Lovecruft 4fcfef1bde
Add _parsers._is_string() function, and change _sanitise() to use it. 2013-06-28 02:29:36 +00:00
Isis Lovecruft 4871e9e038
Move allowed_options into separate groups in their own functions. 2013-06-28 02:28:29 +00:00
Isis Lovecruft 9b9e441dd7
Update function docs for _parsers._is_allowed() function. 2013-06-28 01:44:04 +00:00
Isis Lovecruft 1e03011296
Remove unnecessary comment, there is now a unittest for this condition. 2013-06-28 01:42:05 +00:00
Isis Lovecruft a37557c000
Change the sets of unittests to use the combined sig test. 2013-06-09 11:22:42 +00:00
Isis Lovecruft e1139c7e37
Remove commented out code from _util._copy_data(). 2013-06-09 08:36:22 +00:00
Isis Lovecruft bcaa26685b
Change several imports for installed modules to be absolute in _meta.py. 2013-06-09 08:35:17 +00:00
Isis Lovecruft a707a50c31
Update test directory shortcut in gnupg/_logger.py. 2013-06-09 08:34:15 +00:00
Isis Lovecruft ceb38fdefe
Change directory shortcuts in gnupg._util.py module. 2013-06-09 08:33:30 +00:00
Isis Lovecruft 1afcda8364
Fix a misnamed process thread variable. 2013-06-09 08:25:34 +00:00
Isis Lovecruft 5e47dd7351
Use one of our test_key files for a sig test to save entropy. 2013-06-09 08:24:46 +00:00
Isis Lovecruft c7f648e2a8
Combine sig encoding and algorithm tests into string test to save entropy. 2013-06-09 08:24:21 +00:00
Isis Lovecruft 59de070468 Write the recv key to a file for later tests to use to save entropy. 2013-06-09 08:14:05 +00:00
Isis Lovecruft 61c9a8818d Rename a unittest to test what it actually tests. 2013-06-09 08:12:46 +00:00
Isis Lovecruft ab00cd69e4
Import with from the future. 2013-06-09 08:11:33 +00:00
Isis Lovecruft 9f6a0a08fb
Use separate keyrings during multi recipient test to avoid overwrites. 2013-06-09 08:09:34 +00:00
Isis Lovecruft 762f750db0
Should be TestCase.assertEquals to test equality, not equivalence. 2013-06-09 08:07:00 +00:00
Isis Lovecruft 900c41619b
If using a virtualenv, we don't want the env pip and distribute to be upgraded.
* The proper way to do this is to upgrade globally with the get_pip.py script
   and the distribute_setup.py script, and then create the virtualenv with:
       $ . $(which virtualenvwrapper.sh)
       $ WORKON_HOME=~/.virtualenvs && export WORKON_HOME
       $ mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools \
           --distribute --no-site-packages gnupg
2013-06-09 05:44:43 +00:00