[Pywikibot-commits] [Gerrit] Define PY2 and OSWIN32 once in config module - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Define PY2 and OSWIN32 once in config module ...................................................................... Define PY2 and OSWIN32 once in config module Move imports to the top and re-order the imports Change-Id: I920beb91a2a2e6ea690fbc13d2b11e0b22af490c --- M pywikibot/config2.py 1 file changed, 18 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index ebc2cc7..b383cc3 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -44,20 +44,26 @@ import collections import os +import platform +import re import stat import sys -import re +import types from warnings import warn -if sys.platform == 'win32': - if sys.version_info[0] > 2: +from pywikibot import __url__ +from pywikibot.logging import error, output, warning + +OSWIN32 = (sys.platform == 'win32') +PY2 = (sys.version_info[0] > 2) + +if OSWIN32: + if not PY2: import winreg else: import _winreg as winreg -from pywikibot import __url__ -from pywikibot.logging import error, output, warning # This frozen set should contain all imported modules/variables, so it must # occur directly after the imports. At that point globals() only contains the @@ -287,8 +293,7 @@ else: base_dir_cand = [] home = os.path.expanduser("~") - if sys.platform == 'win32': - import platform + if OSWIN32: win_version = int(platform.version()[0]) if win_version == 5: sub_dir = ["Application Data"] @@ -374,7 +379,7 @@ # This default code should work fine, so you don't have to think about it. # TODO: consider getting rid of this config variable. try: - if sys.version_info[0] > 2 or not sys.stdout.encoding: + if not PY2 or not sys.stdout.encoding: console_encoding = sys.stdout.encoding else: console_encoding = sys.stdout.encoding.decode('ascii') @@ -935,8 +940,8 @@ _filestatus = os.stat(_filename) _filemode = _filestatus[0] _fileuid = _filestatus[4] - if sys.platform == 'win32' or _fileuid in [os.getuid(), 0]: - if sys.platform == 'win32' or _filemode & 0o02 == 0: + if OSWIN32 or _fileuid in [os.getuid(), 0]: + if OSWIN32 or _filemode & 0o02 == 0: with open(_filename, 'rb') as f: exec(compile(f.read(), _filename, 'exec'), _uc) else: @@ -1032,7 +1037,7 @@ # Fix up transliteration_target if transliteration_target == 'not set': - if sys.platform == 'win32': + if OSWIN32: transliteration_target = console_encoding warning( 'Running on Windows and transliteration_target is not set.\n' @@ -1043,10 +1048,10 @@ transliteration_target = None -if sys.platform == 'win32' and editor is None: +if OSWIN32 and editor is None: editor = _detect_win32_editor() -if sys.platform == 'win32' and editor: +if OSWIN32 and editor: # single character string literals from # https://docs.python.org/2/reference/lexical_analysis.html#string-literals # encode('unicode-escape') also changes Unicode characters @@ -1080,7 +1085,6 @@ # When called as main program, list all configuration variables # if __name__ == "__main__": - import types _all = 1 for _arg in sys.argv[1:]: if _arg == "modified": -- To view, visit https://gerrit.wikimedia.org/r/239536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I920beb91a2a2e6ea690fbc13d2b11e0b22af490c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>