diff --git a/contrib/import-checker.py b/contrib/import-checker.py --- a/contrib/import-checker.py +++ b/contrib/import-checker.py @@ -47,6 +47,7 @@ allowsymbolimports = ( 'mercurial.thirdparty.zope', 'mercurial.thirdparty.zope.interface', 'typing', + 'xml.etree.ElementTree', ) # Allow list of symbols that can be directly imported. diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -8,6 +8,10 @@ import os import re import shutil +from xml.etree.ElementTree import ( + ElementTree, + XMLParser, +) from mercurial.i18n import _ from mercurial import ( @@ -20,26 +24,6 @@ from . import common NoRepo = common.NoRepo -# The naming drift of ElementTree is fun! - -try: - import xml.etree.cElementTree.ElementTree as ElementTree - import xml.etree.cElementTree.XMLParser as XMLParser -except ImportError: - try: - import xml.etree.ElementTree.ElementTree as ElementTree - import xml.etree.ElementTree.XMLParser as XMLParser - except ImportError: - try: - import elementtree.cElementTree.ElementTree as ElementTree - import elementtree.cElementTree.XMLParser as XMLParser - except ImportError: - try: - import elementtree.ElementTree.ElementTree as ElementTree - import elementtree.ElementTree.XMLParser as XMLParser - except ImportError: - pass - class darcs_source(common.converter_source, common.commandline): def __init__(self, ui, repotype, path, revs=None):