diff options
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/COPYING.LESSER | 2 | ||||
| -rw-r--r-- | lang/python/MANIFEST.in | 1 | ||||
| -rw-r--r-- | lang/python/docs/Short_History.rst | 2 | ||||
| -rw-r--r-- | lang/python/docs/TODO.rst | 2 | ||||
| -rw-r--r-- | lang/python/docs/old-commits.log | 2 | ||||
| -rw-r--r-- | lang/python/gpgme.i | 1 | ||||
| -rw-r--r-- | lang/python/pyme/core.py | 1 | ||||
| -rw-r--r-- | lang/python/pyme/util.py | 1 | ||||
| -rwxr-xr-x | lang/python/setup.py | 1 |
9 files changed, 1 insertions, 12 deletions
diff --git a/lang/python/COPYING.LESSER b/lang/python/COPYING.LESSER index b124cf58..2331e2a4 100644 --- a/lang/python/COPYING.LESSER +++ b/lang/python/COPYING.LESSER @@ -506,5 +506,3 @@ if necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in index 45671b64..f0795385 100644 --- a/lang/python/MANIFEST.in +++ b/lang/python/MANIFEST.in @@ -3,4 +3,3 @@ include gpgme-h-clean.py gpgme.i include helpers.c helpers.h include Makefile recursive-include pyme *.py - diff --git a/lang/python/docs/Short_History.rst b/lang/python/docs/Short_History.rst index 839570e1..126c1218 100644 --- a/lang/python/docs/Short_History.rst +++ b/lang/python/docs/Short_History.rst @@ -53,5 +53,3 @@ At the current time the Python 3 fork is not available via PyPI and the pip installer. The recommended installation method is to follow the instructions in lang/py3-pyme/INSTALL. This will build the necessary SWIG portions against the installed version of GPGME. - - diff --git a/lang/python/docs/TODO.rst b/lang/python/docs/TODO.rst index 7796230b..a398ccdf 100644 --- a/lang/python/docs/TODO.rst +++ b/lang/python/docs/TODO.rst @@ -21,5 +21,3 @@ Documentation is to be moved to a more appropriate docs/ directory and produced using reST in preparation for inevitable publication by way of Sphinx and the existing infrastructure at readthedocs.org or the projects new home at gnupg.org. - - diff --git a/lang/python/docs/old-commits.log b/lang/python/docs/old-commits.log index 0db59a08..93661e35 100644 --- a/lang/python/docs/old-commits.log +++ b/lang/python/docs/old-commits.log @@ -703,7 +703,7 @@ Date: Sat May 10 15:41:02 2014 +0100 Merge branch 'master' of bitbucket.org:malb/pyme Conflicts: - setup.py + setup.py commit eea6537921061b4dcfc54e00a99d3fa110e71433 Author: Martin Albrecht <[email protected]> diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i index c5b5bc97..4809fd6c 100644 --- a/lang/python/gpgme.i +++ b/lang/python/gpgme.i @@ -294,4 +294,3 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status, return err_status; } %} - diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py index f3829d5f..2a0ca072 100644 --- a/lang/python/pyme/core.py +++ b/lang/python/pyme/core.py @@ -480,4 +480,3 @@ def wait(hang): else: context = Context(context) return (status, context) - diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py index a9fa19d2..3c34c79e 100644 --- a/lang/python/pyme/util.py +++ b/lang/python/pyme/util.py @@ -95,4 +95,3 @@ class GpgmeWrapper(object): _funcwrap.__doc__ = getattr(func, "__doc__") return wrapper - diff --git a/lang/python/setup.py b/lang/python/setup.py index f3d91431..374df5dc 100755 --- a/lang/python/setup.py +++ b/lang/python/setup.py @@ -92,4 +92,3 @@ setup(name = "pyme", license=pyme.version.copyright + \ ", Licensed under the GPL version 2 and the LGPL version 2.1" ) - |