Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95765
Change subject: Merge remote-tracking branch 'remotes/origin/master'
......................................................................
Merge remote-tracking branch 'remotes/origin/master'
Conflicts:
archivebot.py
Change-Id: I7e0fef9d9aa6d65e56a3bc4847538d61283b69dc
---
M archivebot.py
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/65/95765/1
diff --git a/archivebot.py b/archivebot.py
index 0a63d93..9395c1a 100644
--- a/archivebot.py
+++ b/archivebot.py
@@ -446,11 +446,11 @@
def key_ok(self):
s = new_hash()
-<<<<<<< HEAD (1cf8a6 [PEP8] changes for archivebot.py)
+<<<<<<< HEAD
s.update(self.salt + '\n')
=======
s.update(self.salt+'\n')
->>>>>>> BRANCH (3e2547 [PEP8] changes for archivebot.py)
+>>>>>>> remotes/origin/master
s.update(self.Page.title().encode('utf8') + '\n')
return self.get('key') == s.hexdigest()
@@ -543,13 +543,13 @@
self.commentParams)
self.archives[a].update(comment)
-<<<<<<< HEAD (1cf8a6 [PEP8] changes for archivebot.py)
+<<<<<<< HEAD
# Save the page itself
rx = re.compile('{{%s\n.*?\n}}' % self.tpl, re.DOTALL)
=======
#Save the page itself
rx = re.compile('{{'+self.tpl+'\n.*?\n}}', re.DOTALL)
->>>>>>> BRANCH (3e2547 [PEP8] changes for archivebot.py)
+>>>>>>> remotes/origin/master
self.Page.header = rx.sub(self.attr2text(), self.Page.header)
self.commentParams['count'] = self.archivedThreads
self.commentParams['archives'] = ', '.join(
--
To view, visit https://gerrit.wikimedia.org/r/95765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e0fef9d9aa6d65e56a3bc4847538d61283b69dc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
