Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180896
Change subject: tabs -> 4 spaces
......................................................................
tabs -> 4 spaces
Change-Id: Ida5697686ff99492828c17bbcfff4979a89a1e6a
---
M adminlog.py
M config.py
2 files changed, 59 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot
refs/changes/96/180896/1
diff --git a/adminlog.py b/adminlog.py
index a70e6aa..3c2503d 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -2,68 +2,67 @@
import datetime
months = ["January", "February", "March", "April", "May", "June", "July",
- "August", "September",
- "October", "November", "December"]
+ "August", "September", "October", "November", "December"]
def log(config, message, project, author):
- if config.enable_identica:
- import statusnet
+ if config.enable_identica:
+ import statusnet
- if config.wiki_category:
- import re
+ if config.wiki_category:
+ import re
- site = mwclient.Site(config.wiki_connection, path=config.wiki_path)
- site.login(config.wiki_user, config.wiki_pass,
domain=config.wiki_domain)
- if config.enable_projects:
- project = project.capitalize()
- pagename = config.wiki_page % project
- else:
- pagename = config.wiki_page
+ site = mwclient.Site(config.wiki_connection, path=config.wiki_path)
+ site.login(config.wiki_user, config.wiki_pass, domain=config.wiki_domain)
+ if config.enable_projects:
+ project = project.capitalize()
+ pagename = config.wiki_page % project
+ else:
+ pagename = config.wiki_page
- page = site.Pages[pagename]
- if page.redirect:
- page = next(p.links())
+ page = site.Pages[pagename]
+ if page.redirect:
+ page = next(p.links())
- text = page.edit()
- lines = text.split('\n')
- position = 0
- # Um, check the date
- now = datetime.datetime.utcnow()
- logline = "* %02d:%02d %s: %s" % (now.hour, now.minute, author, message)
- month = str(now.month)
- day = str(now.day)
- # Try extracting latest date header
- header = "=" * config.wiki_header_depth
- for line in lines:
- position += 1
- if line.startswith(header):
- undef, month, day, undef = line.split(" ", 3)
- break
- if months[now.month - 1] != month or now.day != int(day):
- lines.insert(0, "")
- lines.insert(0, logline)
- lines.insert(0, "%s %s %d %s" % (header, months[now.month - 1],
- now.day, header))
- else:
- lines.insert(position, logline)
- if config.wiki_category:
- if not re.search('\[\[Category:' + config.wiki_category +
'\]\]', text):
- lines.append('<noinclude>[[Category:' +
- config.wiki_category + ']]</noinclude>')
- saveresult = page.save('\n'.join(lines), "%s (%s)" % (message, author),
bot=False)
+ text = page.edit()
+ lines = text.split('\n')
+ position = 0
+ # Um, check the date
+ now = datetime.datetime.utcnow()
+ logline = "* %02d:%02d %s: %s" % (now.hour, now.minute, author, message)
+ month = str(now.month)
+ day = str(now.day)
+ # Try extracting latest date header
+ header = "=" * config.wiki_header_depth
+ for line in lines:
+ position += 1
+ if line.startswith(header):
+ undef, month, day, undef = line.split(" ", 3)
+ break
+ if months[now.month - 1] != month or now.day != int(day):
+ lines.insert(0, "")
+ lines.insert(0, logline)
+ lines.insert(0, "%s %s %d %s" % (header, months[now.month - 1],
+ now.day, header))
+ else:
+ lines.insert(position, logline)
+ if config.wiki_category:
+ if not re.search('\[\[Category:' + config.wiki_category + '\]\]',
text):
+ lines.append('<noinclude>[[Category:' +
+ config.wiki_category + ']]</noinclude>')
+ saveresult = page.save('\n'.join(lines), "%s (%s)" % (message, author),
bot=False)
- micro_update = ("%s: %s" % (author, message))[:140]
+ micro_update = ("%s: %s" % (author, message))[:140]
- if config.enable_identica:
- snapi = statusnet.StatusNet({'user': config.identica_username,
- 'passwd': config.identica_password,
- 'api': 'https://identi.ca/api'})
- snapi.update(micro_update)
+ if config.enable_identica:
+ snapi = statusnet.StatusNet({'user': config.identica_username,
+ 'passwd': config.identica_password,
+ 'api': 'https://identi.ca/api'})
+ snapi.update(micro_update)
- if config.enable_twitter:
- import twitter
- twitter_api = twitter.Api(**config.twitter_api_params)
- twitter_api.PostUpdate(micro_update)
+ if config.enable_twitter:
+ import twitter
+ twitter_api = twitter.Api(**config.twitter_api_params)
+ twitter_api.PostUpdate(micro_update)
- return site.api('query', prop='info', inprop='url',
revids=page.revision)['query']['pages'].values()[0]['canonicalurl']
+ return site.api('query', prop='info', inprop='url',
revids=page.revision)['query']['pages'].values()[0]['canonicalurl']
diff --git a/config.py b/config.py
index 47a4278..cbc3c6c 100644
--- a/config.py
+++ b/config.py
@@ -22,10 +22,10 @@
# application's settings'. Finally, go back to the 'Details' tab and click
# 'Create my access token'.
twitter_api_params = {
- 'access_token_key':
'NNNNNNNNNN-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', # noqa
- 'access_token_secret': 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
# noqa
- 'consumer_key': 'XXXXXXXXXXXXXXXXXXXXX',
# noqa
- 'consumer_secret': 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
# noqa
+ 'access_token_key': 'NNNNNNNNNN-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
# noqa
+ 'access_token_secret': 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
# noqa
+ 'consumer_key': 'XXXXXXXXXXXXXXXXXXXXX',
# noqa
+ 'consumer_secret': 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
# noqa
}
# Channels to join
@@ -92,12 +92,12 @@
check_users = False
# A semantic query to use to search the wiki for a trust list; example:
-# user_query = ("[[IRC Nick::+]] or [[IRC Cloak::+]]|?IRC Nick|?IRC Cloak
+# user_query = ("[[IRC Nick::+]] or [[IRC Cloak::+]]|?IRC Nick|?IRC Cloak
# "|limit=500|format=json")
user_query = ""
# The query path URL; example:
-# wiki_query_path = "/wiki/Special:Ask/"
+# wiki_query_path = "/wiki/Special:Ask/"
wiki_query_path = ""
# Whether we "warn" or "error" if the user isn't in the trust list
--
To view, visit https://gerrit.wikimedia.org/r/180896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida5697686ff99492828c17bbcfff4979a89a1e6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
