diff options
| -rw-r--r-- | doc/gpgme-python-howto.texi | 26 | ||||
| -rw-r--r-- | lang/python/docs/GPGMEpythonHOWTOen.org | 8 |
2 files changed, 22 insertions, 12 deletions
diff --git a/doc/gpgme-python-howto.texi b/doc/gpgme-python-howto.texi index 51c1bfea..1f9a4b07 100644 --- a/doc/gpgme-python-howto.texi +++ b/doc/gpgme-python-howto.texi @@ -66,7 +66,7 @@ Known Issues * Breaking Builds:: * Multiple installations:: * Won't Work With Windows:: -* I don't like SWIG, Use CFFI instead: I don't like SWIG Use CFFI instead. +* I don't like SWIG, Use CFFI instead: I don't like SWIG Use CFFI instead. Fundamentals @@ -126,7 +126,7 @@ Miscellaneous work-arounds Copyright and Licensing -* Copyright (C) The GnuPG Project, 2018: Copyright (C) The GnuPG Project 2018. +* Copyright (C) The GnuPG Project, 2018: Copyright (C) The GnuPG Project 2018. * License GPL compatible:: @end detailmenu @@ -138,6 +138,8 @@ Copyright and Licensing @multitable {aaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} @item Version: @tab 0.1.4 +@item GPGME Version: +@tab 1.12.0-draft @item Author: @tab Ben McGinnes <ben@@gnupg.org> @item Author GPG Key: @@ -279,12 +281,9 @@ version 3.0 (or any later version). @subsection The PyME package maintained by Martin Albrecht This package is the origin of these bindings, though they are somewhat -different now. For details of when and how the PyME package was folded -back into GPGME itself see the @emph{Short History} -document@footnote{@samp{lang/python/docs/Short_History.org} and/or -@samp{lang/python/docs/Short_History.html}.} in the Python bindings -@samp{docs} directory.@footnote{The @samp{lang/python/docs/} directory -in the GPGME source.} +different now. For details of when and how the PyME package was +folded back into GPGME itself see the @emph{Short History} document@footnote{@samp{Short_History.org} and/or @samp{Short_History.html}.} +in the Python bindings @samp{docs} directory.@footnote{The @samp{lang/python/docs/} directory in the GPGME source.} The PyME package was first released in 2002 and was also the first attempt to implement a low level binding to GPGME. In doing so it @@ -391,7 +390,7 @@ they be encountered. * Breaking Builds:: * Multiple installations:: * Won't Work With Windows:: -* I don't like SWIG, Use CFFI instead: I don't like SWIG Use CFFI instead. +* I don't like SWIG, Use CFFI instead: I don't like SWIG Use CFFI instead. @end menu @node Breaking Builds @@ -2073,8 +2072,13 @@ information in Python. import subprocess import sys +if sys.platform == "win32": + gpgconfcmd = "gpgconf.exe --list-options gpg" +else: + gpgconfcmd = "gpgconf --list-options gpg" + try: - lines = subprocess.getoutput("gpgconf --list-options gpg").splitlines() + lines = subprocess.getoutput(gpgconfcmd).splitlines() except: process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE) procom = process.communicate() @@ -2121,7 +2125,7 @@ Neomutt mail clients. @chapter Copyright and Licensing @menu -* Copyright (C) The GnuPG Project, 2018: Copyright (C) The GnuPG Project 2018. +* Copyright (C) The GnuPG Project, 2018: Copyright (C) The GnuPG Project 2018. * License GPL compatible:: @end menu diff --git a/lang/python/docs/GPGMEpythonHOWTOen.org b/lang/python/docs/GPGMEpythonHOWTOen.org index 1e5db6dd..c9f14213 100644 --- a/lang/python/docs/GPGMEpythonHOWTOen.org +++ b/lang/python/docs/GPGMEpythonHOWTOen.org @@ -16,6 +16,7 @@ :END: | Version: | 0.1.4 | +| GPGME Version: | 1.12.0-draft | | Author: | Ben McGinnes <[email protected]> | | Author GPG Key: | DB4724E6FA4286C92B4E55C4321E4E2373590E5D | | Language: | Australian English, British English | @@ -1982,8 +1983,13 @@ information in Python. import subprocess import sys +if sys.platform == "win32": + gpgconfcmd = "gpgconf.exe --list-options gpg" +else: + gpgconfcmd = "gpgconf --list-options gpg" + try: - lines = subprocess.getoutput("gpgconf --list-options gpg").splitlines() + lines = subprocess.getoutput(gpgconfcmd).splitlines() except: process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE) procom = process.communicate() |