jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444854 )
Change subject: Improve readability of delete.py
......................................................................
Improve readability of delete.py
Change-Id: I443f4d4ae2083efbb23b3b071dc0b04e4d447cd6
---
M scripts/delete.py
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/delete.py b/scripts/delete.py
index b1d62de..8612e1d 100755
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -158,17 +158,17 @@
- self.getOption('isorphan')
"""
refs = self.current_page.ref_table
- if refs:
- total = sum(len(v) for v in refs.values())
- if total > 1:
- pywikibot.warning('There are {} pages that link to {}.'
- .format(total, self.current_page))
- else:
- pywikibot.warning('There is a page that links to {}.'
- .format(self.current_page))
- else:
+ if not refs:
return
+ total = sum(len(v) for v in refs.values())
+ if total > 1:
+ pywikibot.warning('There are {} pages that link to {}.'
+ .format(total, self.current_page))
+ else:
+ pywikibot.warning('There is a page that links to {}.'
+ .format(self.current_page))
+
show_n_pages = self.getOption('isorphan')
width = len(max((ns.canonical_prefix() for ns in refs), key=len))
for ns in sorted(refs):
--
To view, visit https://gerrit.wikimedia.org/r/444854
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I443f4d4ae2083efbb23b3b071dc0b04e4d447cd6
Gerrit-Change-Number: 444854
Gerrit-PatchSet: 2
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444853 )
Change subject: Improve grammar of delete.py
......................................................................
Improve grammar of delete.py
Change-Id: I8a7e31e9bee67d165655eb7552b26ea5e4bfaa49
---
M scripts/delete.py
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/delete.py b/scripts/delete.py
index 5c7a8a4..b1d62de 100755
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -152,7 +152,7 @@
def display_references(self):
"""
- Display pages which links the current page, sorted per namespace.
+ Display pages that link to the current page, sorted per namespace.
Number of pages to display per namespace is provided by:
- self.getOption('isorphan')
@@ -160,8 +160,12 @@
refs = self.current_page.ref_table
if refs:
total = sum(len(v) for v in refs.values())
- pywikibot.warning('There are %d pages who link to %s.'
- % (total, self.current_page))
+ if total > 1:
+ pywikibot.warning('There are {} pages that link to {}.'
+ .format(total, self.current_page))
+ else:
+ pywikibot.warning('There is a page that links to {}.'
+ .format(self.current_page))
else:
return
--
To view, visit https://gerrit.wikimedia.org/r/444853
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a7e31e9bee67d165655eb7552b26ea5e4bfaa49
Gerrit-Change-Number: 444853
Gerrit-PatchSet: 3
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444561 )
Change subject: [doc] Update HISTORY.rst
......................................................................
[doc] Update HISTORY.rst
Change-Id: I1fe7759288bc01a48cedfee7a00af61026a418d3
---
M HISTORY.rst
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.rst b/HISTORY.rst
index fb55f18..ff5bd84 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,12 +4,14 @@
Current release
---------------
+* Open RotatingFileHandler with utf-8 encoding (T188231)
* Fix occasional failure of TestLogentries due to hidden namespace (T197506)
* Remove multiple empty sections at once in cosmetic_changes (T196324)
* Fix stub template position by putting it above interwiki comment (T57034)
* Fix handling of API continuation in PropertyGenerator (T196876)
* Use PyMySql as pure-Python MySQL client library instead of oursql, deprecate MySQLdb (T89976, T142021)
* Ensure that BaseBot.treat is always processing a Page object (T196562, T196813)
+* Update global bot settings
* New mediawiki projects were provided
* Bugfixes and improvements
* Localisation updates
--
To view, visit https://gerrit.wikimedia.org/r/444561
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fe7759288bc01a48cedfee7a00af61026a418d3
Gerrit-Change-Number: 444561
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444786 )
Change subject: Remove BasePage._namespace_obj
......................................................................
Remove BasePage._namespace_obj
According to T104864, the issue with namespace method is resolved.
_namespace_obj has been a temporary workaround for that issue.
Remove _namespace_obj and correct the return types of Page.namespace
and Link.namespace.
Bug: T104864
Change-Id: I97c4340dbfd11ca9dcc35a0f1db2ca7c79e0f829
---
M pywikibot/page.py
M scripts/interwiki.py
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 6054c3c..b75002e 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -241,17 +241,11 @@
Return the number of the namespace of the page.
@return: namespace of the page
- @rtype: int
+ @rtype: Namespace
"""
return self._link.namespace
@property
- def _namespace_obj(self):
- """Return the namespace object of the page."""
- # TODO: T104864: Temporary until Page.namespace() is consistent
- return self.site.namespaces[self.namespace()]
-
- @property
def content_model(self):
"""
Return the content model for this page.
@@ -269,7 +263,7 @@
"""Return the depth/subpage level of the page."""
if not hasattr(self, '_depth'):
# Check if the namespace allows subpages
- if self._namespace_obj.subpages:
+ if self.namespace().subpages:
self._depth = self.title().count('/')
else:
# Does not allow subpages, which means depth is always 0
@@ -5692,7 +5686,7 @@
"""
Return the namespace of the link.
- @rtype: unicode
+ @rtype: Namespace
"""
if not hasattr(self, "_namespace"):
self.parse()
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index b36175f..f11ad05 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -2367,7 +2367,7 @@
@rtype: bool
"""
# Check if the page is in content namespace
- if page._namespace_obj.content:
+ if page.namespace().content:
# Check if the page contains at least 50 characters
return len(page.text) < 50
else:
--
To view, visit https://gerrit.wikimedia.org/r/444786
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I97c4340dbfd11ca9dcc35a0f1db2ca7c79e0f829
Gerrit-Change-Number: 444786
Gerrit-PatchSet: 1
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444424 )
Change subject: Skip TestIndexPageMappings and test_url_image
......................................................................
Skip TestIndexPageMappings and test_url_image
These tests occasionally fail causing multiple failures on Travis and
Appveyor jobs. We can also mark them as expectedFailure, but that
would make noise on unexpected success messages during the tests, making
detection of unexpected success messages that can actually be fixed harder.
Bug: T193637
Bug: T181913
Change-Id: If1765d94cc798f37b228730e5d5adec302f7824c
---
M tests/proofreadpage_tests.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index 02fae23..826cdfc 100644
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -284,6 +284,7 @@
self.assertEqual(json.loads(page_text), json.loads(loaded_text))
@require_modules('bs4')
+ @unittest.skip('T181913 and T114318')
def test_url_image(self):
"""Test fetching of url image of the scan of ProofreadPage."""
page = ProofreadPage(self.site, self.valid['title'])
@@ -479,6 +480,7 @@
self._test_page_text()
+(a)unittest.skip('T193637 and T114318')
class TestIndexPageMappings(IndexPageTestCase):
"""Test IndexPage class."""
--
To view, visit https://gerrit.wikimedia.org/r/444424
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If1765d94cc798f37b228730e5d5adec302f7824c
Gerrit-Change-Number: 444424
Gerrit-PatchSet: 3
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot