jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491033 ) Change subject: [bugfix] Fix version comparison ...................................................................... [bugfix] Fix version comparison - Fix comparison for Python 3.6 because (3,5,0) > (3,5) is True - also use tools.PY2 instead of sys.version_info[0] > 2 Bug: T164163 Change-Id: I2e9a91f4b9e54c80c18e8dc47d0dce8625b5f39c --- M pywikibot/userinterfaces/gui.py 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 49f467d..bd81740 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -8,19 +8,17 @@ # (C) Rob W.W. Hooft, 2003 # (C) Daniel Herding, 2004 # Wikiwichtel -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals -import sys - import pywikibot from pywikibot import __url__ -from pywikibot.tools import PY2, UnicodeType +from pywikibot.tools import PY2, PYTHON_VERSION, UnicodeType -if sys.version_info[0] > 2: +if not PY2: import tkinter as Tkinter from tkinter.scrolledtext import ScrolledText from tkinter import simpledialog as tkSimpleDialog @@ -31,7 +29,7 @@ from ScrolledText import ScrolledText # T164163: Fix idlelib import in Python 3.6 -if sys.version_info > (3, 5): +if PYTHON_VERSION >= (3, 6): from idlelib import ( search as SearchDialog, replace as ReplaceDialog, -- To view, visit https://gerrit.wikimedia.org/r/491033 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e9a91f4b9e54c80c18e8dc47d0dce8625b5f39c Gerrit-Change-Number: 491033 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)