Build Update for wikimedia/pywikibot-core
-------------------------------------
Build: #2962
Status: Passed
Duration: 18 minutes and 43 seconds
Commit: 428420a (2.0)
Author: John Vandenberg
Message: Allow Subject.originPage to be updated
3488a4b1bb introduced a bug by changing a attribute to be a property
without a setter, however interwiki.py frequently sets this value.
Change-Id: I656e03a1d7499f7e1ba79185a8c55a5d3061681a
(cherry picked from commit 9011580e19c2aedfb0ba30c93daae04bd7d50151)
View the changeset: https://github.com/wikimedia/pywikibot-core/compare/074acec01b58...428420a5…
View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/83555458
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
jenkins-bot has submitted this change and it was merged.
Change subject: Allow Subject.originPage to be updated
......................................................................
Allow Subject.originPage to be updated
3488a4b1bb introduced a bug by changing a attribute to be a property
without a setter, however interwiki.py frequently sets this value.
Change-Id: I656e03a1d7499f7e1ba79185a8c55a5d3061681a
(cherry picked from commit 9011580e19c2aedfb0ba30c93daae04bd7d50151)
---
M pywikibot/interwiki_graph.py
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Mpaa: Looks good to me, approved
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py
index 6f2c49a..c9e2918 100644
--- a/pywikibot/interwiki_graph.py
+++ b/pywikibot/interwiki_graph.py
@@ -91,6 +91,11 @@
"""Page on the origin wiki."""
return self._origin
+ @origin.setter
+ def origin(self, value):
+ """Page on the origin wiki."""
+ self._origin = value
+
@property
def originPage(self):
"""Deprecated property for the origin page.
@@ -100,6 +105,14 @@
# TODO: deprecate this property
return self.origin
+ @originPage.setter
+ def originPage(self, value):
+ """Deprecated property for the origin page.
+
+ DEPRECATED. Use origin.
+ """
+ self.origin = value
+
@property
def foundIn(self):
"""Mapping of pages to others pages interwiki linked to it.
--
To view, visit https://gerrit.wikimedia.org/r/242518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I656e03a1d7499f7e1ba79185a8c55a5d3061681a
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: 2.0
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.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: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Don't stop iterators using StopIteration
......................................................................
[FIX] Don't stop iterators using StopIteration
With PEP 479 [1] it has been discouraged that a generator is stopped using
`StopIteration`. Instead if should just return from the function or method.
With 3.7 it'll convert that `StopIteration` into `RuntimeError` while 3.5 and
3.6 only issue deprecation warnings.
[1]: https://www.python.org/dev/peps/pep-0479/
Bug: T106224
Change-Id: I2743962594bc099dfeabc6f88d3654b178fb024d
---
M pywikibot/pagegenerators.py
M pywikibot/tools/__init__.py
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index d9a4ead..2263ed5 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1685,7 +1685,7 @@
while True:
page_count = min(len(generator), step)
if not page_count:
- raise StopIteration
+ return
for page in PreloadingGenerator(generator, page_count):
yield page
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index ce07b8d..4ce740c 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -786,9 +786,12 @@
add = container_setitem
for item in iterable:
- if (key(item) if key else item) not in container:
- add(item)
- yield item
+ try:
+ if (key(item) if key else item) not in container:
+ add(item)
+ yield item
+ except StopIteration:
+ return
class CombinedError(KeyError, IndexError):
--
To view, visit https://gerrit.wikimedia.org/r/242409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2743962594bc099dfeabc6f88d3654b178fb024d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: proofreadpage_tests.py: remove duplicated code
......................................................................
proofreadpage_tests.py: remove duplicated code
Remove duplicate code of test_get_labels(), left in code by mistake.
Moved a comment present in duplicated code to test_get_labels().
Change-Id: I8cc7383399f47710aec38a692cf0ea775205d12e
---
M tests/proofreadpage_tests.py
1 file changed, 1 insertion(+), 20 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index 8a1715f..33d67d5 100644
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -345,11 +345,11 @@
# Get label from number.
self.assertEqual(index_page.get_label_from_page_number(num), label)
+ # Error if number does not exists.
self.assertRaises(KeyError, index_page.get_label_from_page_number, -1)
# Get label from page.
self.assertEqual(index_page.get_label_from_page(proofread_page), label)
-
# Error if page does not exists.
self.assertRaises(KeyError, index_page.get_label_from_page, None)
@@ -395,25 +395,6 @@
for n in num_set:
p = index_page.get_page_from_number(n)
self.assertEqual(index_page._numbers_from_page[p], n)
-
- def test_page_number_mapping(self, key):
- """Test consistency of page <-> mapping."""
- data = self.sites[key]
- num, title_num, label = data['get_label']
-
- index_page = IndexPage(self.site, self.sites[key]['index'])
- page_title = self.sites[key]['page'].format(title_num)
- proofread_page = ProofreadPage(self.site, page_title)
-
- # Get label from number.
- self.assertEqual(index_page.get_label_from_page_number(num), label)
- # Error if number does not exists.
- self.assertRaises(KeyError, index_page.get_label_from_page_number, -1)
-
- # Get label from page.
- self.assertEqual(index_page.get_label_from_page(proofread_page), label)
- # Error if page does not exists.
- self.assertRaises(KeyError, index_page.get_label_from_page, None)
if __name__ == '__main__':
--
To view, visit https://gerrit.wikimedia.org/r/243416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8cc7383399f47710aec38a692cf0ea775205d12e
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>