jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491046 ) Change subject: [cleanup] Use tools.PY2 instead of sys.version_info ...................................................................... [cleanup] Use tools.PY2 instead of sys.version_info Change-Id: I528cae132e738e5b78b0ca58482637465d34b761 --- M pywikibot/__init__.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/sparql.py M pywikibot/data/wikistats.py M pywikibot/date.py M pywikibot/diff.py M pywikibot/family.py M pywikibot/logentries.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/site.py M pywikibot/textlib.py M pywikibot/tools/chars.py M pywikibot/tools/ip.py M pywikibot/weblib.py M scripts/archive/featured.py M scripts/casechecker.py M scripts/category.py M scripts/data_ingestion.py M scripts/flickrripper.py M scripts/imagerecat.py M scripts/redirect.py M scripts/reflinks.py M scripts/replace.py M scripts/script_wui.py M scripts/weblinkchecker.py 27 files changed, 66 insertions(+), 90 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 61b2699..c0f5214 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -15,7 +15,6 @@ from decimal import Decimal import math import re -import sys import threading import time @@ -72,7 +71,7 @@ from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from queue import Queue long = int basestring = str diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index fc9b369..d1b7d61 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -12,7 +12,7 @@ - Basic HTTP error handling """ # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -52,7 +52,7 @@ except ImportError as e: requests_oauthlib = e -if sys.version_info[0] > 2: +if not PY2: from http import cookiejar as cookielib from urllib.parse import quote, urlparse else: diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 065ae62..b902f67 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Http backend layer, formerly providing a httplib2 wrapper.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -13,12 +13,11 @@ # standard python libraries import codecs import re -import sys import pywikibot -from pywikibot.tools import deprecated, UnicodeMixin +from pywikibot.tools import deprecated, PY2, UnicodeMixin -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlparse else: from urlparse import urlparse diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index ebe6605..813987c 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -1,23 +1,22 @@ # -*- coding: utf-8 -*- """SPARQL Query interface.""" # -# (C) Pywikibot team, 2016-2018 +# (C) Pywikibot team, 2016-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals import json -import sys from requests.exceptions import Timeout from pywikibot import config, warning, Site, sleep from pywikibot.comms import http -from pywikibot.tools import UnicodeMixin, py2_encode_utf_8 +from pywikibot.tools import UnicodeMixin, PY2, py2_encode_utf_8 from pywikibot.exceptions import Error, TimeoutError -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import quote else: from urllib2 import quote diff --git a/pywikibot/data/wikistats.py b/pywikibot/data/wikistats.py index 6cb1ee1..309e549 100644 --- a/pywikibot/data/wikistats.py +++ b/pywikibot/data/wikistats.py @@ -6,7 +6,6 @@ # Distributed under the terms of the MIT license. from __future__ import absolute_import, division, unicode_literals -import sys from io import BytesIO, StringIO import pywikibot @@ -149,7 +148,7 @@ data = self.raw_cached(table, 'csv') - if sys.version_info[0] > 2: + if not PY2: f = StringIO(data.decode('utf8')) else: f = BytesIO(data) diff --git a/pywikibot/date.py b/pywikibot/date.py index 683a37f..f924632 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -17,12 +17,11 @@ import datetime import re from string import digits as _decimalDigits # noqa: N812 -import sys from pywikibot.textlib import NON_LATIN_DIGITS -from pywikibot.tools import first_lower, first_upper, deprecated +from pywikibot.tools import first_lower, first_upper, deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: unicode = str basestring = (str,) diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 7a49369..f536793 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Diff module.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2019 # # Distributed under the terms of the MIT license. # @@ -9,7 +9,6 @@ import difflib import math -import sys try: from collections.abc import Sequence @@ -18,11 +17,10 @@ from difflib import _format_range_unified as format_range_unified import pywikibot -from pywikibot.tools import chars -from pywikibot.tools import deprecated_args +from pywikibot.tools import chars, deprecated_args, PY2 from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from itertools import zip_longest else: from itertools import izip_longest as zip_longest diff --git a/pywikibot/family.py b/pywikibot/family.py index bd769bb..d511407 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -23,11 +23,10 @@ from pywikibot.exceptions import UnknownFamily, FamilyMaintenanceWarning from pywikibot.tools import ( deprecated, deprecated_args, remove_last_args, issue_deprecation_warning, - FrozenDict, classproperty + FrozenDict, classproperty, PY2 ) -PY3 = sys.version_info[0] > 2 -if PY3: +if not PY2: import urllib.parse as urlparse else: import urlparse diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 6020fee..4f070b6 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -7,13 +7,11 @@ # from __future__ import absolute_import, division, unicode_literals -import sys - import pywikibot from pywikibot.exceptions import Error, HiddenKeyError -from pywikibot.tools import deprecated, classproperty +from pywikibot.tools import deprecated, classproperty, PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) _logger = 'wiki' diff --git a/pywikibot/page.py b/pywikibot/page.py index 59c8f5a..c1433dd 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5863,7 +5863,7 @@ return '[[%s:%s]]' % (self.site.code, title) return '[[%s:%s:%s]]' % (self.site.family.name, self.site.code, title) - if sys.version_info[0] > 2: + if not PY2: def __str__(self): """Return a string representation.""" return self.__unicode__() diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index a57efff..7b907fb 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -14,7 +14,7 @@ &params; """ # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -56,8 +56,9 @@ UnknownExtension, ) from pywikibot.proofreadpage import ProofreadPage +from pywikibot.tools import PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) from itertools import zip_longest else: diff --git a/pywikibot/site.py b/pywikibot/site.py index 0a2c5c6..7b0450a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -21,7 +21,6 @@ import mimetypes import os import re -import sys import threading import time import uuid @@ -81,7 +80,7 @@ ) from pywikibot.tools.ip import is_IP -if sys.version_info[0] > 2: +if not PY2: from itertools import zip_longest from urllib.parse import urlencode, urlparse diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 83d06df..2730c54 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -20,7 +20,6 @@ from collections import Sequence import datetime import re -import sys import pywikibot from pywikibot import config2 as config @@ -32,10 +31,11 @@ DeprecatedRegex, StringTypes, UnicodeType, - issue_deprecation_warning + issue_deprecation_warning, + PY2, ) -if sys.version_info[0] > 2: +if not PY2: from html.parser import HTMLParser basestring = (str,) unicode = str diff --git a/pywikibot/tools/chars.py b/pywikibot/tools/chars.py index 5c1eca5..7b09075 100644 --- a/pywikibot/tools/chars.py +++ b/pywikibot/tools/chars.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Character based helper functions(not wiki-dependent).""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2019 # # Distributed under the terms of the MIT license. # @@ -9,10 +9,10 @@ import sys -from pywikibot.tools import LazyRegex +from pywikibot.tools import LazyRegex, PY2 -if sys.version_info[0] > 2: +if not PY2: unicode = str diff --git a/pywikibot/tools/ip.py b/pywikibot/tools/ip.py index 42b28be..dd9b6fb 100644 --- a/pywikibot/tools/ip.py +++ b/pywikibot/tools/ip.py @@ -1,19 +1,18 @@ # -*- coding: utf-8 -*- """IP address tools module.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals import re -import sys from distutils.version import StrictVersion from warnings import warn -from pywikibot.tools import DeprecatedRegex, UnicodeType +from pywikibot.tools import DeprecatedRegex, PY2, UnicodeType _ipaddress_e = _ipaddr_e = _ipaddr_version = None @@ -23,7 +22,7 @@ _ipaddress_e = e ip_address = None -if not ip_address or sys.version_info[0] < 3: +if not ip_address or PY2: try: from ipaddr import __version__ as _ipaddr_version except ImportError as e: @@ -36,7 +35,7 @@ _ipaddr_e = ImportError('ipaddr %s is broken.' % _ipaddr_version) if ip_address and ip_address.__module__ == 'ipaddress': - if sys.version_info[0] < 3: + if PY2: # This backport fails many tests # https://pypi.org/project/py2-ipaddress # It accepts u'1111' as a valid IP address. diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py index e2df994..6617bf1 100644 --- a/pywikibot/weblib.py +++ b/pywikibot/weblib.py @@ -8,7 +8,6 @@ from __future__ import absolute_import, division, unicode_literals import json -import sys from time import sleep from xml.etree import ElementTree @@ -16,9 +15,9 @@ from pywikibot.comms import http from pywikibot import config2 -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/archive/featured.py b/scripts/archive/featured.py index 0dea1e9..1a4fa9a 100755 --- a/scripts/archive/featured.py +++ b/scripts/archive/featured.py @@ -56,8 +56,8 @@ # # (C) Maxim Razin, 2005 # (C) Leonardo Gregianin, 2005-2008 -# (C) xqt, 2009-2018 -# (C) Pywikibot team, 2005-2018 +# (C) xqt, 2009-2019 +# (C) Pywikibot team, 2005-2019 # # Distributed under the terms of the MIT license. # @@ -65,7 +65,6 @@ import pickle import re -import sys import pywikibot @@ -73,9 +72,9 @@ from pywikibot.pagegenerators import PreloadingGenerator from pywikibot.tools.formatter import color_format -from pywikibot.tools import issue_deprecation_warning +from pywikibot.tools import issue_deprecation_warning, PY2 -if sys.version_info[0] > 2: +if not PY2: unichr = chr diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 3b43a7d..08bd2f4 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -20,11 +20,11 @@ from pywikibot import i18n from pywikibot.data import api -from pywikibot.tools import first_lower, first_upper, formatter +from pywikibot.tools import first_lower, first_upper, formatter, PY2 from scripts.category import CategoryMoveRobot as CategoryMoveBot -if sys.version_info[0] > 2: +if not PY2: xrange = range diff --git a/scripts/category.py b/scripts/category.py index 8814ff4..c781311 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -129,7 +129,6 @@ import os import pickle import re -import sys from operator import methodcaller @@ -144,11 +143,11 @@ ) from pywikibot.cosmetic_changes import moved_links from pywikibot.tools import ( - deprecated_args, deprecated, ModuleDeprecationWrapper, open_archive + deprecated_args, deprecated, ModuleDeprecationWrapper, open_archive, PY2 ) from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) # This is required for the text that is shown when you run this script diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 348cfbc..ad1a66c 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -8,7 +8,7 @@ python pwb.py data_ingestion -csvdir:local_dir/ -page:config_page """ # -# (C) Pywikibot team, 2012-2018 +# (C) Pywikibot team, 2012-2019 # # Distributed under the terms of the MIT license. # @@ -20,23 +20,19 @@ import io import os import posixpath -import sys from warnings import warn import pywikibot from pywikibot.comms.http import fetch from pywikibot import pagegenerators from pywikibot.specialbots import UploadRobot -from pywikibot.tools import deprecated, deprecated_args +from pywikibot.tools import deprecated, deprecated_args, PY2 -if sys.version_info[0] > 2: +if not PY2: import csv -else: - import unicodecsv as csv - -if sys.version_info[0] > 2: from urllib.parse import urlparse else: + import unicodecsv as csv from urlparse import urlparse diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 2cc0ccc..0aa2755 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -28,19 +28,19 @@ import hashlib import io import re -import sys import pywikibot from pywikibot import config, textlib from pywikibot.comms.http import fetch from pywikibot.specialbots import UploadRobot +from pywikibot.tools import PY2 try: from pywikibot.userinterfaces.gui import Tkdialog except ImportError as _tk_error: Tkdialog = _tk_error -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index cdc9c57..c990cfb 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -27,7 +27,7 @@ """ # # (C) Multichill, 2008-2011 -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -35,16 +35,15 @@ import re import socket -import sys import xml.etree.ElementTree import pywikibot from pywikibot import pagegenerators, textlib from pywikibot.comms.http import fetch -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/redirect.py b/scripts/redirect.py index 2d77de4..72809c6 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -80,7 +80,6 @@ from __future__ import absolute_import, division, unicode_literals import datetime -import sys import pywikibot @@ -89,9 +88,9 @@ RedirectPageBot) from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import extract_templates_and_params_regex_simple -from pywikibot.tools import issue_deprecation_warning +from pywikibot.tools import issue_deprecation_warning, PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index aa842eb..dfbf37f 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -35,7 +35,7 @@ one from i18n/reflinks.py """ # (C) Nicolas Dumazet (NicDumZ), 2008 -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -46,7 +46,6 @@ import re import socket import subprocess -import sys import tempfile from functools import partial @@ -58,13 +57,13 @@ from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) -from pywikibot.tools.formatter import color_format +from pywikibot.tools.formatter import color_format, PY2 import requests from scripts import noreferences -if sys.version_info[0] > 2: +if not PY2: import http.client as httplib from urllib.error import URLError else: diff --git a/scripts/replace.py b/scripts/replace.py index cb625fa..b6a7d63 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -149,7 +149,6 @@ except ImportError: # Python 2.7 from collections import Sequence import re -import sys import time import warnings @@ -164,18 +163,17 @@ deprecated, deprecated_args, issue_deprecation_warning, + PY2, ) from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from queue import Queue long = int + basestring = (str, ) else: from Queue import Queue -if sys.version_info[0] > 2: - basestring = (str, ) - # This is required for the text that is shown when you run this script # with the parameter -help. diff --git a/scripts/script_wui.py b/scripts/script_wui.py index d405e85..572d045 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -18,7 +18,7 @@ """ # # (C) Dr. Trigon, 2012-2014 -# (C) Pywikibot team, 2013-2018 +# (C) Pywikibot team, 2013-2019 # # Distributed under the terms of the MIT license. # @@ -87,10 +87,10 @@ import pywikibot # pywikibot.botirc depends on https://pypi.org/project/irc import pywikibot.botirc - from pywikibot.tools.formatter import color_format +from pywikibot.tools import PY2 -if sys.version_info[0] > 2: +if not PY2: import _thread as thread else: import thread # noqa: H237 (module does not exist in Python 3) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index b50a370..f47af6c 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -110,7 +110,6 @@ import pickle import re import socket -import sys import threading import time @@ -134,12 +133,12 @@ from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 from pywikibot.tools.formatter import color_format import requests -if sys.version_info[0] > 2: +if not PY2: import http.client as httplib import urllib.parse as urlparse import urllib.request as urllib -- To view, visit https://gerrit.wikimedia.org/r/491046 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: I528cae132e738e5b78b0ca58482637465d34b761 Gerrit-Change-Number: 491046 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: D3r1ck01 &lt;alangiderick(a)gmail.com&gt; Gerrit-Reviewer: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot (75)