jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337266 )
Change subject: archivebot.py: fix -calc in python3
......................................................................
archivebot.py: fix -calc in python3
Follow-up of commit 12117d223ee1e3729b2db2632f05fd257a0553e1
Change-Id: I0c008687df21ef00bddd8cbe43ada7fb2b555050
---
M scripts/archivebot.py
1 file changed, 15 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index a20cbf1..8adb204 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -291,6 +291,16 @@
return re.compile(r'(?:(?:%s):)%s%s' % (u'|'.join(ns), marker,
title))
+def calc_md5_hexdigest(txt, salt):
+ """Return md5 hexdigest computed from text and
salt."""
+ s = md5()
+ s.update(salt.encode('utf-8'))
+ s.update(b'\n')
+ s.update(txt.encode('utf8'))
+ s.update(b'\n')
+ return s.hexdigest()
+
+
class TZoneUTC(datetime.tzinfo):
"""Class building a UTC tzinfo object."""
@@ -543,12 +553,9 @@
def key_ok(self):
"""Return whether key is valid."""
- s = md5()
- s.update(self.salt.encode('utf-8'))
- s.update(b'\n')
- s.update(self.page.title().encode('utf8'))
- s.update(b'\n')
- return self.get_attr('key') == s.hexdigest()
+ hexdigest = calc_md5_hexdigest(self.page.title().encode('utf8'),
+ self.salt)
+ return self.get_attr('key') == hexdigest
def load_config(self):
"""Load and validate archiver template."""
@@ -684,7 +691,7 @@
filename = None
pagename = None
namespace = None
- salt = None
+ salt = ''
force = False
calc = None
args = []
@@ -730,14 +737,8 @@
calc = page.title()
else:
pywikibot.output(u'NOTE: the specified page "%s" does not (yet)
exist.' % calc)
- s = md5()
- s.update(salt + '\n')
- s.update(calc + '\n')
- pywikibot.output(u'key = ' + s.hexdigest())
+ pywikibot.output('key = %s' % calc_md5_hexdigest(calc, salt))
return
-
- if not salt:
- salt = ''
if not args:
pywikibot.bot.suggest_help(additional_text='No template was specified.')
--
To view, visit
https://gerrit.wikimedia.org/r/337266
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c008687df21ef00bddd8cbe43ada7fb2b555050
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>