# HG changeset patch # User Marcin Kasperski # Date 2019-06-15 15:33:42 # Node ID 746ad756473574e0b3e2588a11ce9e472ab492c5 # Parent 20c4f5df88da14fabe79007531dd048c724209e1 Various py3 incompatibilities (syntax errors so far) diff --git a/mercurial_keyring.py b/mercurial_keyring.py --- a/mercurial_keyring.py +++ b/mercurial_keyring.py @@ -136,6 +136,11 @@ def import_keyring(): "ctypes", "secretstorage.exceptions", "fs.opener", + "win32ctypes.pywin32", + "win32ctypes.pywin32.pywintypes", + "win32ctypes.pywin32.win32cred", + "pywintypes", + "win32cred", ]) if was_imported_now: # Shut up warning about uninitialized logging by keyring @@ -416,7 +421,7 @@ class HTTPPasswordHandler(object): _debug(ui, _("Saving password for %s to keyring") % user) try: password_store.set_http_password(final_url, user, pwd) - except Exception, e: + except Exception as e: keyring = import_keyring() if isinstance(e, keyring.errors.PasswordSetError): ui.traceback() @@ -616,7 +621,7 @@ def try_smtp_login(ui, smtp_obj, usernam (username)) smtp_obj.login(username, password) return True - except smtplib.SMTPException, inst: + except smtplib.SMTPException as inst: if inst.smtp_code == 535: ui.status(_("SMTP login failed: %s\n\n") % inst.smtp_error) return False @@ -635,7 +640,6 @@ def keyring_supported_smtp(ui, username) >>>>> and # <<<<< markers, there are also some fixes which make the code working on various Mercurials (like parsebool import). """ - try: from mercurial.utils.stringutil import parsebool except ImportError: @@ -710,10 +714,10 @@ def keyring_supported_smtp(ui, username) def send(sender, recipients, msg): try: return s.sendmail(sender, recipients, msg) - except smtplib.SMTPRecipientsRefused, inst: + except smtplib.SMTPRecipientsRefused as inst: recipients = [r[1] for r in inst.recipients.values()] raise error.Abort('\n' + '\n'.join(recipients)) - except smtplib.SMTPException, inst: + except smtplib.SMTPException as inst: raise error.Abort(inst) return send