diff options
Diffstat (limited to 'lang/python')
-rw-r--r-- | lang/python/doc/meta/old-commits.log | 16 | ||||
-rw-r--r-- | lang/python/doc/rst/gpgme-python-howto.rst | 6 | ||||
-rw-r--r-- | lang/python/doc/src/gpgme-python-howto | 6 | ||||
-rw-r--r-- | lang/python/doc/texinfo/gpgme-python-howto.texi | 8 | ||||
-rw-r--r-- | lang/python/helpers.c | 2 | ||||
-rwxr-xr-x | lang/python/tests/t-quick-key-manipulation.py | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/lang/python/doc/meta/old-commits.log b/lang/python/doc/meta/old-commits.log index 93661e35..eb870cda 100644 --- a/lang/python/doc/meta/old-commits.log +++ b/lang/python/doc/meta/old-commits.log @@ -420,7 +420,7 @@ Date: Sat May 2 10:28:42 2015 +1000 Updated Makefile * set make to use python3 instead. - * This will mean a successful port may need to be maintained seperately + * This will mean a successful port may need to be maintained separately from the original python2 code instead of merged, but ought to be able to share most things. So maybe merge with separated make files or a pre-make script to set python2 or python3 prior to building ... decide @@ -1934,7 +1934,7 @@ commit 45e8a5f4e13d3ca797ec3b0037242874a6be5562 Author: belyi <devnull@localhost> Date: Sat Mar 26 19:44:18 2005 +0000 - Updated verion number to 0.6.2 in version.py + Updated version number to 0.6.2 in version.py Added examples/*.glade files into documentation package. pyme/debian/examples | 1 + @@ -1997,7 +1997,7 @@ Author: belyi <devnull@localhost> Date: Fri Mar 25 04:30:17 2005 +0000 Improved PyGtkGpgKeys example to manage owner_trust on keys. - Added another example inter-edit.py which is just a hepler to write + Added another example inter-edit.py which is just a helper to write scripts for Context.op_edit() command. pyme/examples/PyGtkGpgKeys.glade | 78 ++++++++++++++++++++++++++++++++++++++++ @@ -2011,7 +2011,7 @@ Author: belyi <devnull@localhost> Date: Fri Mar 25 00:30:39 2005 +0000 Updated PyGtkGpgKeys example to include import, export and reload - functionality. Also added ability to remove number of keys simultanously. + functionality. Also added ability to remove number of keys simultaneously. Rearanged how KeyColumn is used to avoid unnecessary sorts and duplication of information in different parts of the code. @@ -2035,7 +2035,7 @@ commit 59e23f32c3b46413c9ec09e23e1a385a110fb103 Author: belyi <devnull@localhost> Date: Thu Mar 24 05:44:58 2005 +0000 - Added wait method Context class which handles asynchornous calls a little + Added wait method Context class which handles asynchronous calls a little bit better than the one generated by SWIG. pyme/debian/changelog | 7 +++++++ @@ -2101,7 +2101,7 @@ Date: Fri Mar 18 19:09:33 2005 +0000 Added package building for python2.4 - Updated copyright notes to include myslef and avoid confusion who's the + Updated copyright notes to include myself and avoid confusion who's the maintainer. In John's own words: "I'd prefer to just step out of the picture". Jonh's copyright notice left intact. @@ -2182,7 +2182,7 @@ Date: Thu Apr 8 16:15:09 2004 +0000 Ensure that we support only python2.2 and up. :-) Use generators in core.Context class which makes pyme.aux obsolete - Remove importing future nested_scopes since they are standart starting + Remove importing future nested_scopes since they are standard starting with python2.2 pyme/pyme/__init__.py | 5 ++--- @@ -2293,7 +2293,7 @@ commit af7129baa8260697d85c2ddb434562e8a80b62d8 Author: belyi <devnull@localhost> Date: Sat Mar 20 20:15:53 2004 +0000 - Added minimum of formating and SF icon. + Added minimum of formatting and SF icon. pyme-web/index.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lang/python/doc/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst index 3fd8a4d0..4cbb929a 100644 --- a/lang/python/doc/rst/gpgme-python-howto.rst +++ b/lang/python/doc/rst/gpgme-python-howto.rst @@ -1063,7 +1063,7 @@ obtained. #. Import from ProtonMail via HKP for Python Example no. 1 - The following script is avalable with the rest of the examples under + The following script is available with the rest of the examples under the somewhat less than original name, ``pmkey-import-hkp.py``. .. code:: python @@ -1814,7 +1814,7 @@ to any preconfigured keys set in the ``gpg.conf`` file: with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) -If the ``recipients`` paramater is empty then the plaintext is encrypted +If the ``recipients`` parameter is empty then the plaintext is encrypted symmetrically. If no ``passphrase`` is supplied as a parameter or via a callback registered with the ``Context()`` then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2592,7 +2592,7 @@ demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the `key counting <#howto-keys-counting>`__ code. Running that example as an executable Python script, ``keycount.py`` (available in the -``examples/howto/`` directory), will take a noticable amount of time to +``examples/howto/`` directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. diff --git a/lang/python/doc/src/gpgme-python-howto b/lang/python/doc/src/gpgme-python-howto index 4ad5bc41..e12dc364 100644 --- a/lang/python/doc/src/gpgme-python-howto +++ b/lang/python/doc/src/gpgme-python-howto @@ -1108,7 +1108,7 @@ address can be obtained. :CUSTOM_ID: import-hkp4py-pm1 :END: -The following script is avalable with the rest of the examples under +The following script is available with the rest of the examples under the somewhat less than original name, =pmkey-import-hkp.py=. #+BEGIN_SRC python -i @@ -1869,7 +1869,7 @@ with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) #+END_SRC -If the =recipients= paramater is empty then the plaintext is encrypted +If the =recipients= parameter is empty then the plaintext is encrypted symmetrically. If no =passphrase= is supplied as a parameter or via a callback registered with the =Context()= then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2662,7 +2662,7 @@ Nevertheless, there are some situations where the benefits are demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the [[#howto-keys-counting][key counting]] code. Running that example as an executable Python script, =keycount.py= (available in -the =examples/howto/= directory), will take a noticable amount of time +the =examples/howto/= directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. diff --git a/lang/python/doc/texinfo/gpgme-python-howto.texi b/lang/python/doc/texinfo/gpgme-python-howto.texi index d776f58d..4f10bc5b 100644 --- a/lang/python/doc/texinfo/gpgme-python-howto.texi +++ b/lang/python/doc/texinfo/gpgme-python-howto.texi @@ -1249,7 +1249,7 @@ address can be obtained. Import from ProtonMail via HKP for Python Example no. 1 -The following script is avalable with the rest of the examples under +The following script is available with the rest of the examples under the somewhat less than original name, @samp{pmkey-import-hkp.py}. @example @@ -2006,7 +2006,7 @@ with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) @end example -If the @samp{recipients} paramater is empty then the plaintext is encrypted +If the @samp{recipients} parameter is empty then the plaintext is encrypted symmetrically. If no @samp{passphrase} is supplied as a parameter or via a callback registered with the @samp{Context()} then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2774,7 +2774,7 @@ Nevertheless, there are some situations where the benefits are demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the @ref{Counting keys, , key counting} code. Running that example as an executable Python script, @samp{keycount.py} (available in -the @samp{examples/howto/} directory), will take a noticable amount of time +the @samp{examples/howto/} directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. @@ -3089,4 +3089,4 @@ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -@bye
\ No newline at end of file +@bye diff --git a/lang/python/helpers.c b/lang/python/helpers.c index 947819d2..d5d1fc99 100644 --- a/lang/python/helpers.c +++ b/lang/python/helpers.c @@ -914,7 +914,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size) } /* Set the current position from where the next read or write starts - in the data object with the handle HOOK to OFFSET, relativ to + in the data object with the handle HOOK to OFFSET, relative to WHENCE. Returns the new offset in bytes from the beginning of the data object. */ static off_t pyDataSeekCb(void *hook, off_t offset, int whence) diff --git a/lang/python/tests/t-quick-key-manipulation.py b/lang/python/tests/t-quick-key-manipulation.py index 0cfaa9d1..73dce16d 100755 --- a/lang/python/tests/t-quick-key-manipulation.py +++ b/lang/python/tests/t-quick-key-manipulation.py @@ -82,7 +82,7 @@ with support.EphemeralContext() as ctx: # try to revoke a non-existent UID try: - ctx.key_revoke_uid(key, "i dont exist") + ctx.key_revoke_uid(key, "i don't exist") # IMHO this should fail. issue2963. # assert False, "Expected an error but got none" except gpg.errors.GpgError: |