samba-tool user.py

[Rowland Penny]

At the top of user.py, there is this:

try:
    import io
    import gpgme
    gpgme_support = True
    decrypt_samba_gpg_help = "Decrypt the SambaGPG password as cleartext source"
except ImportError as e:
    gpgme_support = False
    decrypt_samba_gpg_help = "Decrypt the SambaGPG password not supported, " + \
            "python-gpgme required"

The Debian based distros are moving to python-gpg instead of
python-gpgme, but the 'samba_tool.user.samba.tests.samba_tool.user'
test fails with python-gpg:

time: 2018-06-01 13:59:27.457334Z
failure: samba.tests.samba_tool.user.samba.tests.samba_tool.user.UserCmdTestCase.test_setpassword(ad_dc_ntvfs:local) [
Exception: Exception: Traceback (most recent call last):
  File "/usr/src/git/samba-master/bin/python/samba/tests/samba_tool/user.py", line 214, in test_setpassword
    self.assertCmdSuccess(result, out, err, "Ensure syncpasswords --cache-ldb-initialize runs")
  File "/usr/src/git/samba-master/bin/python/samba/tests/samba_tool/base.py", line 110, in assertCmdSuccess
    exit, out, err, msg))
AssertionError: exit[-1] stdout[] stderr[ERROR: Decrypt the SambaGPG password not supported, python-gpgme required
]: Ensure syncpasswords --cache-ldb-initialize runs

I suppose I could replace 'import gpgme' with 'import python-gpg', but
I feel this will break other distros.

Suggestions ??

Rowland