Yurik has submitted this change and it was merged.
Change subject: https by default, bug fix, saferun tile output
......................................................................
https by default, bug fix, saferun tile output
Change-Id: I16441d92aae3243b56b86ec2d1dc6189c54adb7e
---
M scripts/api.py
M scripts/weblogs2.py
2 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Yurik: Verified; Looks good to me, approved
diff --git a/scripts/api.py b/scripts/api.py
index f34368d..7d1a917 100644
--- a/scripts/api.py
+++ b/scripts/api.py
@@ -164,10 +164,10 @@
:param onDemand: if True, will postpone login until an actual API
request is made
:return:
"""
+ self.tokens = {}
if onDemand:
self._loginOnDemand = (user, password)
return
- self.tokens = {}
res = self('login', lgname=user, lgpassword=password)['login']
if res['result'] == 'NeedToken':
res = self('login', lgname=user, lgpassword=password,
lgtoken=res['token'])['login']
@@ -253,7 +253,7 @@
return self.tokens[tokenType]
def request(self, method, forceSSL=False, headers=None, **request_kw):
- """Make either a low level request to the server"""
+ """Make a low level request to the server"""
url = self.url
if forceSSL:
parts = list(urlparse.urlparse(url))
@@ -276,7 +276,7 @@
return r
-def wikimedia(language='en', site='wikipedia', scheme='http', session=None,
log=None):
+def wikimedia(language='en', site='wikipedia', scheme='https', session=None,
log=None):
"""Create a Site object for Wikimedia Foundation site in this format:
[scheme]://[language].[site].org/w/api.php
"""
diff --git a/scripts/weblogs2.py b/scripts/weblogs2.py
index 9290687..1c48ec3 100644
--- a/scripts/weblogs2.py
+++ b/scripts/weblogs2.py
@@ -486,15 +486,20 @@
headerFields = ','.join(headerFields)
text = '{0}\n{1}'.format(headerFields, text)
+ title = wikiTitle + self.settings.wikiPageSuffix
if self.allowEdit:
wiki = self.getWiki()
wiki(
'edit',
- title=wikiTitle + self.settings.wikiPageSuffix,
+ title=title,
summary='refreshing data',
text=text,
token=wiki.token()
)
+ else:
+ title = os.path.join(self.pathCache,
title.replace(':','_').replace('/','_').replace('\\','_'))
+ with open(title, 'w') as f:
+ f.write(text)
def run(self):
self.runHql()
@@ -502,12 +507,12 @@
self.generateGraphData()
def manualRun(self):
- # self.allowEdit = False
+ self.allowEdit = False
# self.runHql()
# w = self.getWiki()
# w.noSSL = True
# self.combineStats()
- # self.generateGraphData()
+ self.generateGraphData()
pass
--
To view, visit https://gerrit.wikimedia.org/r/247763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16441d92aae3243b56b86ec2d1dc6189c54adb7e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/zero-sms
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
