jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/440757 )
Change subject: [doc] pagegenerators: update MySQLPageGenerator
......................................................................
[doc] pagegenerators: update MySQLPageGenerator
https://www.mediawiki.org/wiki/Manual:Pywikibot/MySQL
help page was created recently (T187124), let's add a link to it.
Explicit the fact that two and only two columns are wanted.
Bug: T187124
Change-Id: I0555ef64df38257b265869e02bb8a503f64dfde5
---
M pywikibot/pagegenerators.py
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 9f7538c..85790cb 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2780,8 +2780,9 @@
"""
Yield a list of pages based on a MySQL query.
- Each query should provide the page namespace and page title. An example
- query that yields all ns0 pages might look like::
+ The query should return two columns, page namespace and page title pairs
+ from some table. An example query that yields all ns0 pages might look
+ like::
SELECT
page_namespace,
@@ -2789,6 +2790,8 @@
FROM page
WHERE page_namespace = 0;
+ See https://www.mediawiki.org/wiki/Manual:Pywikibot/MySQL.
+
@param query: MySQL query to execute
@param site: Site object
@type site: L{pywikibot.site.BaseSite}
--
To view, visit https://gerrit.wikimedia.org/r/440757
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: I0555ef64df38257b265869e02bb8a503f64dfde5
Gerrit-Change-Number: 440757
Gerrit-PatchSet: 1
Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org>
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/440744 )
Change subject: Fix occasional failure of TestLogentries due to hidden namespace
......................................................................
Fix occasional failure of TestLogentries due to hidden namespace
Similar to ec4a226ad57, do not try to access 'ns' and 'pageid' values when
the 'title' is hidden.
Bug: T197506
Change-Id: I5c733beef7665825ae3ff7708c02be8e6f7a0984
---
M tests/logentry_tests.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py
index 2702716..2819f88 100644
--- a/tests/logentry_tests.py
+++ b/tests/logentry_tests.py
@@ -90,6 +90,8 @@
if 'title' in logentry.data: # title may be missing
self.assertIsInstance(logentry.ns(), int)
self.assertIsInstance(logentry.pageid(), int)
+ self.assertGreaterEqual(logentry.ns(), -2)
+ self.assertGreaterEqual(logentry.pageid(), 0)
if logtype == 'block' and logentry.isAutoblockRemoval:
self.assertIsInstance(logentry.page(), int)
elif isinstance(logentry, UserTargetLogEntry):
@@ -103,8 +105,6 @@
self.assertEqual(logentry.type(), logtype)
self.assertIsInstance(logentry.user(), unicode)
self.assertGreaterEqual(logentry.logid(), 0)
- self.assertGreaterEqual(logentry.ns(), -2)
- self.assertGreaterEqual(logentry.pageid(), 0)
class TestLogentriesMeta(MetaTestCaseClass):
--
To view, visit https://gerrit.wikimedia.org/r/440744
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: I5c733beef7665825ae3ff7708c02be8e6f7a0984
Gerrit-Change-Number: 440744
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/440725 )
Change subject: family: read `__init__` from `__dict__` and deprecate
......................................................................
family: read `__init__` from `__dict__` and deprecate
deprecated wrapper expect a pure function, but in Python 2.7,
reading the function as a class attribute returns a method bound to
the class (unbound method), which cannot have arbitrary attributes
assigned, and the deprecated wrapper errors out. Reading from
__dict__ should return the actual function regardless of the Python
version used. The existence of the __init__ key is verified prior
the the execution.
Bug: T197529
Change-Id: I2077c6b0fa95c3dc2da0f8c1c5e99d12372ebcb9
---
M pywikibot/family.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 7623698..a334fe5 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -60,8 +60,10 @@
# don't use hasattr() here. consider only the class itself
if '__init__' in cls.__dict__:
# Initializer deprecated. Families should be immutable and any
- # instance / class modification should go to allocator (__new__)
- cls.__init__ = deprecated(cls.__init__)
+ # instance / class modification should go to allocator (__new__).
+ # The function is read from __dict__ because deprecated expect a
+ # function and python 2.7 binds the method to the class.
+ cls.__init__ = deprecated(cls.__dict__['__init__'])
# Invoke initializer immediately and make initializer no-op.
# This is to avoid repeated initializer invokation on repeated
--
To view, visit https://gerrit.wikimedia.org/r/440725
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: I2077c6b0fa95c3dc2da0f8c1c5e99d12372ebcb9
Gerrit-Change-Number: 440725
Gerrit-PatchSet: 2
Gerrit-Owner: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
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/440721 )
Change subject: Suppress ArgumentDeprecationWarning in test_immutable_namespaces_on_read
......................................................................
Suppress ArgumentDeprecationWarning in test_immutable_namespaces_on_read
Also fix the stacklevel in pagegenerators.GeneratorFactory._handle_namespaces.
Change-Id: Id93d28b7119afc0168fa86fe4a659dfcdc7b228c
---
M pywikibot/pagegenerators.py
M tests/pagegenerators_tests.py
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index ab81b8d..9f7538c 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -835,7 +835,7 @@
if isinstance(self._namespaces, frozenset):
warn('Cannot handle arg -namespaces as namespaces can not '
'be altered after a generator is created.',
- ArgumentDeprecationWarning, 2)
+ ArgumentDeprecationWarning, 3)
return True
if not value:
value = pywikibot.input('What namespace are you filtering on?')
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index bcc7afc..927a8a3 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -653,7 +653,13 @@
gf.handleArg('-ns:1,6')
self.assertEqual(gf.namespaces, {1, 6})
self.assertIsInstance(gf.namespaces, frozenset)
- gf.handleArg('-ns:0')
+ with suppress_warnings(
+ 'Cannot handle arg -namespaces as namespaces can not be altered '
+ 'after a generator is created.',
+ pywikibot.exceptions.ArgumentDeprecationWarning
+ ):
+ gf.handleArg('-ns:0')
+
self.assertEqual(gf.namespaces, {1, 6})
def test_unsupported_quality_level_filter(self):
--
To view, visit https://gerrit.wikimedia.org/r/440721
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: Id93d28b7119afc0168fa86fe4a659dfcdc7b228c
Gerrit-Change-Number: 440721
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/374088 )
Change subject: [IMPR] upload.py: Allow to use a file for description
......................................................................
[IMPR] upload.py: Allow to use a file for description
Creation of the -descriptionfile: argument
Bug: T170125
Change-Id: Ia30bba7b19a70168485b554ea1dadfaba81caee4
---
M scripts/upload.py
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/upload.py b/scripts/upload.py
index f729d51..8e81522 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -33,6 +33,7 @@
-recursive When the filename is a directory it also uploads the files from
the subdirectories.
-summary: Pick a custom edit summary for the bot.
+ -descfile: Specify a filename where the description is stored
It is possible to combine -abortonwarn and -ignorewarn so that if the specific
warning is given it won't apply the general one but more specific one. So if it
@@ -57,6 +58,7 @@
#
from __future__ import absolute_import, unicode_literals
+import codecs
import math
import os
import re
@@ -114,6 +116,7 @@
chunk_size_regex = re.compile(
r'^-chunked(?::(\d+(?:\.\d+)?)[ \t]*(k|ki|m|mi)?b?)?$', re.I)
recursive = False
+ description_file = None
# process all global bot args
# returns a list of non-global args, i.e. args for upload.py
@@ -149,13 +152,25 @@
elif arg == '-chunked':
match = chunk_size_regex.match(option)
chunk_size = get_chunk_size(match)
+ elif arg == '-descfile':
+ description_file = value
elif arg and not value:
if not url:
url = arg
else:
description.append(arg)
- description = u' '.join(description)
+ description = ' '.join(description)
+
+ if description_file:
+ if description:
+ pywikibot.error('Both a description and a -descfile were '
+ 'provided. Please specify only one of those.')
+ return False
+ with codecs.open(description_file,
+ encoding=pywikibot.config.textfile_encoding) as f:
+ description = f.read().replace('\r\n', '\n')
+
while not ("://" in url or os.path.exists(url)):
if not url:
error = 'No input filename given.'
--
To view, visit https://gerrit.wikimedia.org/r/374088
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: Ia30bba7b19a70168485b554ea1dadfaba81caee4
Gerrit-Change-Number: 374088
Gerrit-PatchSet: 15
Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/440669 )
Change subject: diff_checker.py: Detect escaped single quotes inside single-quoted strings
......................................................................
diff_checker.py: Detect escaped single quotes inside single-quoted strings
Move the quote checks into a new function, `check_quotes`.
Change STRING_MATCH regex to include all string prefixes in a group.
The prefix group will be used in `check_quotes` to skip raw strings.
Rename the returned variable name in check functions from `error` to
`no_errors`, hopefully this makes the code easier to undertand.
Change-Id: I3a00c38cc2faa02da8f094e3f0b26fdfbe375b48
---
M scripts/maintenance/diff_checker.py
1 file changed, 37 insertions(+), 22 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/maintenance/diff_checker.py b/scripts/maintenance/diff_checker.py
index 3001fe0..5f75727 100644
--- a/scripts/maintenance/diff_checker.py
+++ b/scripts/maintenance/diff_checker.py
@@ -6,14 +6,12 @@
- Line lengths: Newly added lines longer than 79 chars are not allowed.
- Unicode literal notations: They are not allowed since we instead import
unicode_literals from __future__.
- - Any added double quoted string should contain a single quote.
+ - Single-quoted strings are preferred, but when a string contains single
+ quote characters, use double quotes to avoid backslashes in the string.
See [[Manual:Pywikibot/Development/Guidelines]] for more info.
Todo: The following rules can be added in the future:
- - For any changes or new lines use single quotes for strings, or double
- quotes if the string contains a single quote. But keep older code
- unchanged. (partially implemented)
- Prefer string.format() instead of modulo operator % for string
formatting. The modulo operator might be deprecated by a future
python release.
@@ -46,7 +44,7 @@
IGNORABLE_LONG_LINE = re_compile(r'\s*(# )?<?https?://\S+>?$').match
STRING_MATCH = re_compile(
- r'(?P<unicode_literal>u)?[bfr]*(?P<quote>\'+|"+)', IGNORECASE,
+ r'(?P<prefix>[bfru]*)?(?P<quote>\'+|"+)', IGNORECASE,
).match
@@ -64,9 +62,33 @@
print('{0}:{1}:{2}: {3}'.format(path, line_no, col_no, error))
+def check_quotes(match, file_path, start):
+ """Check string quotes and return True if there are no errors."""
+ string = match.string
+ quote = match.group('quote')
+ if quote == '"':
+ if "'" not in string:
+ print_error(
+ file_path, start[0], start[1] + 1,
+ "use 'single-quoted' strings "
+ '(unless the string contains single quote characters)')
+ return False
+ elif quote == "'":
+ if (
+ 'r' not in match.group('prefix')
+ and r'\'' in string
+ and '"' not in string
+ ):
+ print_error(
+ file_path, start[0], start[1] + 1,
+ r'use a "double-quoted" string to avoid \' escape sequence')
+ return False
+ return True
+
+
def check_tokens(file_path, line_nos):
"""Check the style of lines in the given file_path."""
- error = False
+ no_errors = True
max_line = max(line_nos)
with open(file_path, 'rb') as f:
token_generator = tokenize(f.readline)
@@ -78,31 +100,24 @@
if PY2:
string = string.decode('utf-8')
match = STRING_MATCH(string)
- if match.group('unicode_literal'):
- error = True
+ if 'u' in match.group('prefix'):
+ no_errors = False
print_error(
file_path, start[0], start[1] + 1,
'newly-added/modified line with u"" prefixed string '
'literal',
)
- if match.group('quote') == '"' and "'" not in string:
- error = True
- print_error(
- file_path, start[0], start[1] + 1,
- 'newly-added/modified line with "double quoted string" not'
- ' containing any single quotes; use a \'single quoted '
- 'string\' instead',
- )
- return not error
+ no_errors = check_quotes(match, file_path, start) and no_errors
+ return no_errors
def check(latest_patchset):
"""Check that the added/modified lines do not violate the guideline.
- @return: True if line added/modified OK. False otherwise.
+ @return: True if there are no error, False otherwise.
@rtype: bool
"""
- error = False
+ no_errors = True
for patched_file in latest_patchset:
path = patched_file.path
if not (path.endswith('.py') or patched_file.is_removed_file):
@@ -121,10 +136,10 @@
path, line_no, len(line_val),
'newly-added/modified line longer than 79 characters',
)
- error = True
+ no_errors = False
if added_lines:
- error = not check_tokens(path, added_lines) or error
- return not error
+ no_errors = check_tokens(path, added_lines) and no_errors
+ return no_errors
def main():
--
To view, visit https://gerrit.wikimedia.org/r/440669
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: I3a00c38cc2faa02da8f094e3f0b26fdfbe375b48
Gerrit-Change-Number: 440669
Gerrit-PatchSet: 4
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/440658 )
Change subject: Fix Request.__init__ kwargs DeprecationWarning in Category.newest_pages
......................................................................
Fix Request.__init__ kwargs DeprecationWarning in Category.newest_pages
Bug: T197505
Change-Id: Icb948378baa28b7053dbb5293a0e544af7cd96e8
---
M pywikibot/page.py
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 56b8ba1..6054c3c 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3106,9 +3106,10 @@
# checked before the total amount of new pages was found. In worst case
# all pages of a category need to be checked.
for member in pywikibot.data.api.QueryGenerator(
- site=self.site, list='categorymembers', cmsort='timestamp',
- cmdir='older', cmprop='timestamp|title',
- cmtitle=self.title()):
+ site=self.site, parameters={
+ 'list': 'categorymembers', 'cmsort': 'timestamp',
+ 'cmdir': 'older', 'cmprop': 'timestamp|title',
+ 'cmtitle': self.title()}):
# TODO: Upcast to suitable class
page = pywikibot.Page(self.site, member['title'])
assert page.namespace() == member['ns'], \
--
To view, visit https://gerrit.wikimedia.org/r/440658
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: Icb948378baa28b7053dbb5293a0e544af7cd96e8
Gerrit-Change-Number: 440658
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/440548 )
Change subject: Follow PEP 8 in harvest_template.py
......................................................................
Follow PEP 8 in harvest_template.py
"If any return statement returns an expression, any return statements
where no value is returned should explicitly state this as return None..."
Change-Id: Ibeabdad4f4867946002020d5c92bde08c35ead6b
---
M scripts/harvest_template.py
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index 2db474e..bac674c 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -187,12 +187,12 @@
except pywikibot.exceptions.InvalidTitle:
pywikibot.error('%s is not a valid title so it cannot be linked. '
'Skipping.' % link_text)
- return
+ return None
if not linked_page.exists():
pywikibot.output('%s does not exist so it cannot be linked. '
'Skipping.' % (linked_page))
- return
+ return None
if linked_page.isRedirectPage():
linked_page = linked_page.getRedirectTarget()
@@ -205,11 +205,11 @@
if not linked_item or not linked_item.exists():
pywikibot.output('%s does not have a wikidata item to link with. '
'Skipping.' % (linked_page))
- return
+ return None
if linked_item.title() == item.title():
pywikibot.output('%s links to itself. Skipping.' % (linked_page))
- return
+ return None
return linked_item
--
To view, visit https://gerrit.wikimedia.org/r/440548
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: Ibeabdad4f4867946002020d5c92bde08c35ead6b
Gerrit-Change-Number: 440548
Gerrit-PatchSet: 1
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(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