jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/500395 )
Change subject: [bugfix] Fix error thrown on saving user-passwords.py
......................................................................
[bugfix] Fix error thrown on saving user-passwords.py
Bug: T219762
Change-Id: I82c0293b49a3d3932d5ebe1248edcc4ae2f1e1e7
---
M generate_user_files.py
1 file changed, 6 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 87562fb..36decb8 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -372,17 +372,19 @@
raise
if botpasswords:
- # Save if necessary user-password.py
+ # Save user-password.py if necessary
+ # user-config.py is already created at this point
+ # therefore pywikibot.tools can be imported safely
+ from pywikibot.tools import file_mode_checker
try:
# First create an empty file with good permissions, before writing
# in it
with codecs.open(_fncpass, 'w', 'utf-8') as f:
f.write('')
- pywikibot.tools.file_mode_checker(_fncpass, mode=0o600,
- quiet=True)
+ file_mode_checker(_fncpass, mode=0o600, quiet=True)
with codecs.open(_fncpass, 'w', 'utf-8') as f:
f.write(PASSFILE_CONFIG.format(botpasswords=botpasswords))
- pywikibot.tools.file_mode_checker(_fncpass, mode=0o600)
+ file_mode_checker(_fncpass, mode=0o600)
pywikibot.output("'{0}' written.".format(_fncpass))
except EnvironmentError:
os.remove(_fncpass)
--
To view, visit
https://gerrit.wikimedia.org/r/500395
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: I82c0293b49a3d3932d5ebe1248edcc4ae2f1e1e7
Gerrit-Change-Number: 500395
Gerrit-PatchSet: 5
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)