jenkins-bot has submitted this change and it was merged.
Change subject: Bug 65135: Fix the yesterday generator
......................................................................
Bug 65135: Fix the yesterday generator
Change-Id: I04ae2f6a4cef6e4904999492f081a7466b441c0b
---
M scripts/imageuncat.py
1 file changed, 7 insertions(+), 27 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py
index decbdca..d1af10a 100755
--- a/scripts/imageuncat.py
+++ b/scripts/imageuncat.py
@@ -18,7 +18,6 @@
from datetime import timedelta
import pywikibot
from pywikibot import pagegenerators
-import query
#Probably unneeded because these are hidden categories. Have to figure it out.
ignoreCategories = [u'[[Category:CC-BY-SA-3.0]]',
@@ -1235,37 +1234,18 @@
putcomment = u'Please add categories to this image'
-def uploadedYesterday(site=None):
+def uploadedYesterday(site):
'''
Return a pagegenerator containing all the pictures uploaded yesterday.
Should probably copied to somewhere else
+
'''
- result = []
- dateformat = "%Y-%m-%dT00:00:00Z"
- today = datetime.utcnow()
+
+ today = pywikibot.Timestamp.utcnow()
yesterday = today + timedelta(days=-1)
- params = {
- 'action': 'query',
- 'list': 'logevents',
- 'leprop': 'title',
- 'letype': 'upload',
- 'ledir': 'newer',
- 'lelimit': '5000',
- 'lestart': yesterday.strftime(dateformat),
- 'leend': today.strftime(dateformat)
- }
-
- data = query.GetData(params, site)
- try:
- for item in data['query']['logevents']:
- result.append(item['title'])
- except IndexError:
- raise NoPage(u'API Error, nothing found in the APIs')
- except KeyError:
- raise NoPage(u'API Error, nothing found in the APIs')
-
- return pagegenerators.PagesFromTitlesGenerator(result, site)
+ for logentry in site.logevents(logtype='upload', start=yesterday,
end=today, reverse=True):
+ yield logentry.title()
def recentChanges(site=None, delay=0, block=70):
@@ -1357,7 +1337,7 @@
pywikibot.output(
u'You have to specify the generator you want to use for the
program!')
else:
- pregenerator = site.preloadpages(generator)
+ pregenerator = pagegenerators.PreloadingGenerator(generator)
for page in pregenerator:
pywikibot.output(page.title())
if page.exists() and (page.namespace() == 6) \
--
To view, visit https://gerrit.wikimedia.org/r/132722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04ae2f6a4cef6e4904999492f081a7466b441c0b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Multichill <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
