# HG changeset patch # User Marcin Kasperski # Date 2016-04-26 17:53:23 # Node ID 2d48fd11da4d0ccff3efa8861288bf502b805aa2 # Parent cb66425f31c861e7598cf2f56cbd972c611988c3 Relocated non-mercurial imports before Mercurial ones, to perform them before demandimport may strike. diff --git a/mercurial_keyring.py b/mercurial_keyring.py --- a/mercurial_keyring.py +++ b/mercurial_keyring.py @@ -51,6 +51,13 @@ backend (by default keyring guesses, usu you get KDE Wallet under KDE, and Gnome Keyring under Gnome or Unity). ''' +import urllib2 +import smtplib +import socket +import os +import sys +import re + from mercurial import util, sslutil from mercurial.i18n import _ from mercurial.url import passwordmgr @@ -58,13 +65,6 @@ from mercurial import mail from mercurial.mail import SMTPS, STARTTLS from mercurial import encoding -import urllib2 -import smtplib -import socket -import os -import sys -import re - # pylint: disable=invalid-name, line-too-long, protected-access, too-many-arguments ########################################################################### @@ -140,7 +140,6 @@ def import_keyring(): meu.disable_logging("keyring") return mod - ################################################################# # Actual implementation #################################################################