jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/500389 )
Change subject: Revert "[bugfix] Fix error thrown on saving user-passwords.py" ......................................................................
Revert "[bugfix] Fix error thrown on saving user-passwords.py"
This reverts commit 0847c0b793563c153240dccc46cee279b4254a44.
Bug: T219740 Change-Id: Iff35c92f225869290071f2d16f12e85f161fd613 --- M generate_user_files.py 1 file changed, 3 insertions(+), 4 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py index 916d5b3..87562fb 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -18,8 +18,6 @@
from generate_family_file import _import_with_no_user_config
-from pywikibot.tools import file_mode_checker - # DISABLED_SECTIONS cannot be copied; variables must be set manually DISABLED_SECTIONS = {'USER INTERFACE SETTINGS', # uses sys 'EXTERNAL EDITOR SETTINGS', # uses os @@ -380,10 +378,11 @@ # in it with codecs.open(_fncpass, 'w', 'utf-8') as f: f.write('') - file_mode_checker(_fncpass, mode=0o600, quiet=True) + pywikibot.tools.file_mode_checker(_fncpass, mode=0o600, + quiet=True) with codecs.open(_fncpass, 'w', 'utf-8') as f: f.write(PASSFILE_CONFIG.format(botpasswords=botpasswords)) - file_mode_checker(_fncpass, mode=0o600) + pywikibot.tools.file_mode_checker(_fncpass, mode=0o600) pywikibot.output("'{0}' written.".format(_fncpass)) except EnvironmentError: os.remove(_fncpass)