[git] GPGME - branch, master, updated. gpgme-1.12.0-77-gfd34415

by Ben McGinnes cvs at cvs.gnupg.org
Mon Nov 19 11:43:11 CET 2018 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  fd34415bdd57332424bd5a98d279e2331678a2fb (commit)
       via  f773ad392da57e6be4ade93c44baa5d2057c40b6 (commit)
      from  7a1e7006d06fdbab86ea79a197c316744b09d933 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd34415bdd57332424bd5a98d279e2331678a2fb
Author: Ben McGinnes <ben at adversary.org>
Date:   Mon Nov 19 21:38:50 2018 +1100

    python: import type
    
    * Fixed bug T4242 and tested that dropping "Import" in favour of
      "import_type" does indeed work just fine.
    
    Tested-by: Ben McGinnes <ben at adversary.org>
    Signed-off-by: Ben McGinnes <ben at adversary.org>

diff --git a/lang/python/src/constants/__init__.py b/lang/python/src/constants/__init__.py
index 4e5ced2..f8a7308 100644
--- a/lang/python/src/constants/__init__.py
+++ b/lang/python/src/constants/__init__.py
@@ -32,13 +32,6 @@ from . import status, validity
 
 del absolute_import, print_function, unicode_literals, util
 
-# This was a bad idea (though I get why it was done):
-#
-# # A complication arises because 'import' is a reserved keyword.
-# # Import it as 'Import' instead.
-# globals()['Import'] = getattr(
-#     __import__('', globals(), locals(), [str('import')], 1), "import")
-
 __all__ = [
     'data', 'event', 'import_type', 'keysign', 'keylist', 'md', 'pk',
     'protocol', 'sig', 'sigsum', 'status', 'tofu', 'validity', 'create'

commit f773ad392da57e6be4ade93c44baa5d2057c40b6
Author: Ben McGinnes <ben at adversary.org>
Date:   Mon Nov 19 21:19:42 2018 +1100

    python: import constant
    
    * lang/python/src/constants/__init__.py: dropped use of Import
      capitalisation and renamed lang/python/src/constants/import.py to
      lang/python/src/constants/import_type.py to address bug T4242.
    * lang/python/doc/src/gpgme-python-howto: minor docs updates.

diff --git a/lang/python/doc/src/gpgme-python-howto b/lang/python/doc/src/gpgme-python-howto
index e12dc36..7cc9770 100644
--- a/lang/python/doc/src/gpgme-python-howto
+++ b/lang/python/doc/src/gpgme-python-howto
@@ -16,11 +16,11 @@
   :END:
 
 | Version:        | 0.1.4                                    |
-| GPGME Version:  | 1.12.0                                   |
+| GPGME Version:  | 1.12.1                                   |
 | Author:         | [[https://gnupg.org/people/index.html#sec-1-5][Ben McGinnes]] <ben at gnupg.org>             |
 | Author GPG Key: | DB4724E6FA4286C92B4E55C4321E4E2373590E5D |
 | Language:       | Australian English, British English      |
-| xml:lang:       | en-AU, en-GB, en                         |
+| Language codes: | en-AU, en-GB, en                         |
 
 This document provides basic instruction in how to use the GPGME
 Python bindings to programmatically leverage the GPGME library.
@@ -2925,8 +2925,6 @@ from the author at any of the following URLs:
 - [[http://files.au.adversary.org/crypto/gpgme-python-howto.info][GPGME Python Bindings HOWTO draft (Info file AWS S3 no SSL)]]
 - [[https://files.au.adversary.org/crypto/gpgme-python-howto.rst][GPGME Python Bindings HOWTO draft (reST file AWS S3 SSL)]]
 - [[http://files.au.adversary.org/crypto/gpgme-python-howto.rst][GPGME Python Bindings HOWTO draft (reST file AWS S3 no SSL)]]
-- [[https://files.au.adversary.org/crypto/gpgme-python-howto.xml][GPGME Python Bindings HOWTO draft (Docbook 4.2 AWS S3 SSL)]]
-- [[http://files.au.adversary.org/crypto/gpgme-python-howto.xml][GPGME Python Bindings HOWTO draft (Docbook 4.2 AWS S3 no SSL)]]
 
 All of these draft versions except for one have been generated from
 this document via Emacs [[https://orgmode.org/][Org mode]] and [[https://www.gnu.org/software/texinfo/][GNU Texinfo]].  Though it is likely
@@ -2938,8 +2936,8 @@ using the latest version of Pandoc from the Org mode source file using
 either of the following two commands:
 
 #+BEGIN_SRC shell
-  pandoc -f org -t rst -o gpgme-python-howto.rst gpgme-python-howto.org
-  pandoc -f org -t rst -o gpgme-python-howto.rst gpgme-python-howto
+  pandoc -f org -t rst+smart -o gpgme-python-howto.rst gpgme-python-howto.org
+  pandoc -f org -t rst+smart -o gpgme-python-howto.rst gpgme-python-howto
 #+END_SRC
 
 In addition to these there is a significantly less frequently updated
diff --git a/lang/python/src/constants/__init__.py b/lang/python/src/constants/__init__.py
index 1f79f84..4e5ced2 100644
--- a/lang/python/src/constants/__init__.py
+++ b/lang/python/src/constants/__init__.py
@@ -27,19 +27,21 @@ util.process_constants('GPGME_', globals())
 # For convenience, we import the modules here.
 from . import data, keylist, sig, tofu  # The subdirs.
 # The remaining modules can no longer fit on one line.
-from . import create, event, keysign, md, pk, protocol, sigsum, status
-from . import validity
+from . import create, event, import_type, keysign, md, pk, protocol, sigsum
+from . import status, validity
 
 del absolute_import, print_function, unicode_literals, util
 
-# A complication arises because 'import' is a reserved keyword.
-# Import it as 'Import' instead.
-globals()['Import'] = getattr(
-    __import__('', globals(), locals(), [str('import')], 1), "import")
+# This was a bad idea (though I get why it was done):
+#
+# # A complication arises because 'import' is a reserved keyword.
+# # Import it as 'Import' instead.
+# globals()['Import'] = getattr(
+#     __import__('', globals(), locals(), [str('import')], 1), "import")
 
 __all__ = [
-    'data', 'event', 'import', 'keysign', 'keylist', 'md', 'pk', 'protocol',
-    'sig', 'sigsum', 'status', 'tofu', 'validity', 'create'
+    'data', 'event', 'import_type', 'keysign', 'keylist', 'md', 'pk',
+    'protocol', 'sig', 'sigsum', 'status', 'tofu', 'validity', 'create'
 ]
 
 # GPGME 1.7 replaced gpgme_op_edit with gpgme_op_interact.  We
diff --git a/lang/python/src/constants/import.py b/lang/python/src/constants/import_type.py
similarity index 100%
rename from lang/python/src/constants/import.py
rename to lang/python/src/constants/import_type.py

-----------------------------------------------------------------------

Summary of changes:
 lang/python/doc/src/gpgme-python-howto                  | 10 ++++------
 lang/python/src/constants/__init__.py                   | 13 ++++---------
 lang/python/src/constants/{import.py => import_type.py} |  0
 3 files changed, 8 insertions(+), 15 deletions(-)
 rename lang/python/src/constants/{import.py => import_type.py} (100%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org

More information about the Gnupg-commits mailing list