merge

.hgtags

@@ -50,3 +50,4 b' b92327b47c09f80d36c920aafcbec367c92ed78f'
 6bbaecea178efa4c4dee22bcd56e16717848b705 1.1.0
 734e3a7cd0671a4dd01f28b9e670bd55e6247e09 1.1.1
 87c891cda54f14d9f23d3ad008ada78670c98b1f 1.1.2
+f116766d109a593b70ada966f062ea9ec521d926 1.1.3

HISTORY.txt

@@ -1,3 +1,9 b''
+
+1.1.3
+~~~~~~~~~~~~~~~~~~
+
+Mercurial 3.8 compatibility for email over SSL/TLS (SMTPS/STARTTLS
+constructors changed). Should not spoil older versions.
 
 1.1.2
 ~~~~~~~~~~~~~~~~~~

mercurial_keyring.py

@@ -622,9 +622,17 b' def keyring_supported_smtp(ui, username)'
         sslkwargs = {}
     if smtps:
         ui.note(_('(using smtps)\n'))
-        s = SMTPS(sslkwargs, local_hostname=local_hostname)
+
+        # mercurial 3.8 added a mandatory host arg
+        if 'host' in SMTPS.__init__.__code__.co_varnames:
+            s = SMTPS(sslkwargs, local_hostname=local_hostname, host=mailhost)
+        else:
+            s = SMTPS(sslkwargs, local_hostname=local_hostname)
     elif starttls:
-        s = STARTTLS(sslkwargs, local_hostname=local_hostname)
+        if 'host' in STARTTLS.__init__.__code__.co_varnames:
+            s = STARTTLS(sslkwargs, local_hostname=local_hostname, host=mailhost)
+        else:
+            s = STARTTLS(sslkwargs, local_hostname=local_hostname)
     else:
         s = smtplib.SMTP(local_hostname=local_hostname)
     if smtps:

setup.py

@@ -1,5 +1,5 b''
 
-VERSION = '1.1.2'
+VERSION = '1.1.3'
 
 # pylint: disable=unused-import