Various py3 incompatibilities (syntax errors so far)

mercurial_keyring.py

@@ -136,6 +136,11 b' 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 b' 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 b' 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 b' 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 b' 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