[Pywikibot-commits] [Gerrit] (bug 66687) ExpatError obtaining version from SVN - change (pywikibot/compat)

jenkins-bot has submitted this change and it was merged. Change subject: (bug 66687) ExpatError obtaining version from SVN ...................................................................... (bug 66687) ExpatError obtaining version from SVN Wrap expat parse and DOM access in exception block which raises ParseError, so that the calling code can fallback to other version determination routines. Change-Id: I600ce4671861089c9c2d3ad628603fc7a3ac6d9e --- M pywikibot/version.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 257dcac..c4c8f54 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -142,8 +142,11 @@ "<propfind xmlns=\"DAV:\"><allprop/></propfind>", {'Label': rev, 'User-Agent': 'SVN/1.7.5-pywikibot1'}) resp = conn.getresponse() - dom = xml.dom.minidom.parse(resp) - hsh = dom.getElementsByTagName("C:git-commit")[0].firstChild.nodeValue + try: + dom = xml.dom.minidom.parse(resp) + hsh = dom.getElementsByTagName("C:git-commit")[0].firstChild.nodeValue + except Exception: + raise ParseError rev = 's%s' % rev if (not date or not tag or not rev) and not path: raise ParseError -- To view, visit https://gerrit.wikimedia.org/r/140069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I600ce4671861089c9c2d3ad628603fc7a3ac6d9e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot <>