jenkins-bot has submitted this change and it was merged.
Change subject: [i18n] rename gom site messages to it's site lang
......................................................................
[i18n] rename gom site messages to it's site lang
Change-Id: I09bf8db313bbd59e688b3482c5b5d8d0a605d1dd
---
R welcome/gom.json
1 file changed, 0 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/welcome/gom-latn.json b/welcome/gom.json
similarity index 100%
rename from welcome/gom-latn.json
rename to welcome/gom.json
--
To view, visit https://gerrit.wikimedia.org/r/222758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09bf8db313bbd59e688b3482c5b5d8d0a605d1dd
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Improvements for UserEditFilterGenerator
......................................................................
Improvements for UserEditFilterGenerator
- add show_filtered parameter to show skipped pages
- enable timestamp as Timestamp or datetime object
- provide starttime/endtime parametes for Page.revisions and
Page.contributions
Bug: T104265
Change-Id: I57249a9ba28f7031a981104153d584beaac2397a
---
M pywikibot/page.py
M pywikibot/pagegenerators.py
M scripts/template.py
3 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index b47badd..bd867b4 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1467,10 +1467,11 @@
@deprecated_args(getText='content', reverseOrder='reverse')
def revisions(self, reverse=False, step=None, total=None, content=False,
- rollback=False):
+ rollback=False, starttime=None, endtime=None):
"""Generator which loads the version history as Revision instances."""
# TODO: Only request uncached revisions
self.site.loadrevisions(self, getText=content, rvdir=reverse,
+ starttime=starttime, endtime=endtime,
step=step, total=total, rollback=rollback)
return (self._revisions[rev] for rev in
sorted(self._revisions, reverse=not reverse)[:total])
@@ -1523,18 +1524,22 @@
step=step, total=total)
]
- def contributors(self, step=None, total=None):
+ def contributors(self, step=None, total=None,
+ starttime=None, endtime=None):
"""
Compile contributors of this page with edit counts.
@param step: limit each API call to this number of revisions
@param total: iterate no more than this number of revisions in total
+ @param starttime: retrieve revisions starting at this Timestamp
+ @param endtime: retrieve revisions ending at this Timestamp
@return: number of edits for each username
@rtype: L{collections.Counter}
"""
return Counter(rev.user for rev in
- self.revisions(step=step, total=total))
+ self.revisions(step=step, total=total,
+ starttime=starttime, endtime=endtime))
@deprecated('contributors()')
def contributingUsers(self, step=None, total=None):
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index f00acd1..41c3d88 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1482,7 +1482,7 @@
def UserEditFilterGenerator(generator, username, timestamp=None, skip=False,
- max_revision_depth=None):
+ max_revision_depth=None, show_filtered=False):
"""
Generator which will yield Pages modified by username.
@@ -1496,28 +1496,26 @@
@param username: user name which edited the page
@type username: str
@param timestamp: ignore edits which are older than this timestamp
- @type timestamp: str (MediaWiki format JJJJMMDDhhmmss) or None
+ @type timestamp: datetime or str (MediaWiki format JJJJMMDDhhmmss) or None
@param skip: Ignore pages edited by the given user
@type skip: bool
@param max_revision_depth: It only looks at the last editors given by
max_revision_depth
@type max_revision_depth: int or None
+ @param show_filtered: Output a message for each page not yielded
+ @type show_filtered: bool
"""
if timestamp:
- ts = pywikibot.Timestamp.fromtimestampformat(timestamp)
- else:
- ts = pywikibot.Timestamp.min
+ if isinstance(timestamp, basestring):
+ ts = pywikibot.Timestamp.fromtimestampformat(timestamp)
+ else:
+ ts = timestamp
for page in generator:
- found = False
- for ed in page.revisions(total=max_revision_depth):
- if ed.timestamp >= ts:
- if username == ed.user:
- found = True
- break
- else:
- break
- if found != bool(skip): # xor operation
+ contribs = page.contributors(total=max_revision_depth, endtime=ts)
+ if bool(contribs[username]) is not bool(skip): # xor operation
yield page
+ elif show_filtered:
+ pywikibot.output(u'Skipping %s' % page.title(asLink=True))
def CombinedPageGenerator(generators):
diff --git a/scripts/template.py b/scripts/template.py
index 849f50f..3cec5d9 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -356,7 +356,8 @@
gen = pagegenerators.DuplicateFilterPageGenerator(gen)
if user:
gen = pagegenerators.UserEditFilterGenerator(gen, user, timestamp, skip,
- max_revision_depth=100)
+ max_revision_depth=100,
+ show_filtered=True)
if not genFactory.gens:
# make sure that proper namespace filtering etc. is handled
--
To view, visit https://gerrit.wikimedia.org/r/221838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57249a9ba28f7031a981104153d584beaac2397a
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: [PEP257] prescribes the function or method's effect as a command.
......................................................................
[PEP257] prescribes the function or method's effect as a command.
Change-Id: Iced61ca4e26154bf5ea958a62ff1a4d8334113f5
---
M pywikibot/bot.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ricordisamoa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 61b9ab0..489ed80 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -628,7 +628,7 @@
def input_yn(question, default=None, automatic_quit=True, force=False):
"""
- Ask the user a yes/no question and returns the answer as a bool.
+ Ask the user a yes/no question and return the answer as a bool.
@param question: The question asked without trailing spaces.
@type question: basestring
--
To view, visit https://gerrit.wikimedia.org/r/222736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iced61ca4e26154bf5ea958a62ff1a4d8334113f5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org>
Gerrit-Reviewer: jenkins-bot <>