From f773ad392da57e6be4ade93c44baa5d2057c40b6 Mon Sep 17 00:00:00 2001
From: Ben McGinnes <ben@adversary.org>
Date: Mon, 19 Nov 2018 21:19:42 +1100
Subject: [PATCH] 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.
---
 lang/python/doc/src/gpgme-python-howto         | 10 ++++------
 lang/python/src/constants/__init__.py          | 18 ++++++++++--------
 .../constants/{import.py => import_type.py}    |  0
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename lang/python/src/constants/{import.py => import_type.py} (100%)

diff --git a/lang/python/doc/src/gpgme-python-howto b/lang/python/doc/src/gpgme-python-howto
index e12dc364..7cc9770c 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@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 1f79f84a..4e5ced24 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