jenkins-bot has submitted this change and it was merged.
Change subject: 'default_keep' may be a user parameter if present
......................................................................
'default_keep' may be a user parameter if present
otherwise use bot_config.
Disable locale settings error on windoof os. This is just for
testing purposes and does not affect non-simulating of that script
Change-Id: Ia9ecc63445c95e400d6c13968972791c471c327e
---
M sum_disc.py
1 file changed, 10 insertions(+), 3 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sum_disc.py b/sum_disc.py
index 1977cf1..4edf4a3 100644
--- a/sum_disc.py
+++ b/sum_disc.py
@@ -270,7 +270,8 @@
# modification of timezone to be in sync with wiki
os.environ['TZ'] = 'Europe/Amsterdam'
- time.tzset()
+ if hasattr(time, "tzset"):
+ time.tzset()
pywikibot.output(u'Setting process TimeZone (TZ): %s' %
str(time.tzname)) # ('CET', 'CEST')
# init constants
@@ -283,7 +284,10 @@
lang = locale.locale_alias.get(self.site.lang,
locale.locale_alias['en']).split('.')[0]
# use e.g. 'de_DE.UTF-8', 'de_DE.utf8' (thus no decode('latin-1')
anymore!)
- locale.setlocale(locale.LC_TIME, lang + '.UTF-8')
+ try:
+ locale.setlocale(locale.LC_TIME, lang + '.UTF-8')
+ except locale.Error:
+ pass
# init constants
self._userListPage = pywikibot.Page(self.site, bot_config['userlist'])
@@ -514,7 +518,10 @@
# (wenn nötig smooth update: alle keys mit namen '_list' einzeln
updaten, dann werden sie ergänzt statt überschrieben)
self._param.update(user.param)
# re-add defaults to lists in self._param else they are overwritten
- for key in bot_config['default_keep']:
+ keep = self._param['default_keep'] \
+ if 'default_keep' in self._param \
+ else bot_config['default_keep']
+ for key in keep:
if key in user.param:
self._param[key] += copy.deepcopy(self._param_default[key])
self._param['ignorepage_list'].append(self._userPage.title()) #
disc-seite von user IMMER ausschliessen
--
To view, visit https://gerrit.wikimedia.org/r/105447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ecc63445c95e400d6c13968972791c471c327e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: DrTrigon <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
