jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/519798 )
Change subject: [doc] Update HISTORY.rst
......................................................................
[doc] Update HISTORY.rst
Change-Id: Ic862b2cca67241020bf3925a30d0391579d8b34a
---
M HISTORY.rst
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.rst b/HISTORY.rst
index ef3e113..13afef8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,8 +4,23 @@
Current release
---------------
+* Make Family.langs property more robust (T226934)
+* Remove strategy family
+* Handle closed_wikis as read-only (T74674)
+* TokenWallet: login automatically
+* Add closed_wikis to Family.langs property (T225413)
+* Redirect 'mo' site code to 'ro' and remove interwiki_replacement_overrides (T225417, T89451)
* Add support for badges on Wikibase item sitelinks (T128202)
+* Remove login.showCaptchaWindow() method
+* New parameter supplied in suggest_help function for missing dependencies
+* Remove NonMWAPISite class
+* Introduce Claim.copy and prevent adding already saved claims (T220131)
+* Fix create_short_link method after MediaWiki changes (T223865)
+* Validate proofreadpage.IndexPage contents before saving it
* Refactor Link and introduce BaseLink (T66457)
+* Count skipped pages in BaseBot class
+* 'actionthrottledtext' is a retryable wikibase error (T192912)
+* Clear tokens on logout(T222508)
* Deprecation warning: support for Python 2 will be dropped (T213287)
* botirc.IRCBot has been dropped
* Avoid using outdated browseragents (T222959)
@@ -48,7 +63,7 @@
* Support python version 3.7
* pagegenerators.py: add -querypage parameter to yield pages provided by any special page (T214234)
-* Fix comparison of str, bytes and int literal with
+* Fix comparison of str, bytes and int literal
* site.py: add generic self.querypage() to query SpecialPages
* echo.Notification has a new event_id property as integer
* Bugfixes and improvements
--
To view, visit https://gerrit.wikimedia.org/r/519798
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: Ic862b2cca67241020bf3925a30d0391579d8b34a
Gerrit-Change-Number: 519798
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/508087 )
Change subject: [bugfix] Improve option parsing
......................................................................
[bugfix] Improve option parsing
- pagegenerators -imagelinks option was never ported to core; it was
renamed to -imagesused, to avoid confusion with -filelinks. This
means that -images option forwarding to pagegenerators never worked
and it can be removed.
- simplify protections[option] assignment
- simplify message_properties and generator_type assignment
- always call check_protection_level even for an empty string
which is a valid protection level
detached from Ia4f257710
Change-Id: I9cdb970beaa6cd40ea03ba53ba21220714b2f717
---
M scripts/protect.py
1 file changed, 32 insertions(+), 55 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/protect.py b/scripts/protect.py
index 126f536..be694ee 100755
--- a/scripts/protect.py
+++ b/scripts/protect.py
@@ -62,8 +62,6 @@
import pywikibot
from pywikibot import i18n, pagegenerators
from pywikibot.bot import SingleSiteBot
-from pywikibot.exceptions import ArgumentDeprecationWarning
-from pywikibot.tools import issue_deprecation_warning
# This is required for the text that is shown when you run this script
# with the parameter -help.
@@ -169,61 +167,41 @@
# read command line parameters
local_args = pywikibot.handle_args(args)
- gen_factory = pagegenerators.GeneratorFactory()
site = pywikibot.Site()
generator_type = None
- protection_levels = set(site.protection_levels())
- protection_types = site.protection_types()
+ protection_levels = site.protection_levels()
if '' in protection_levels:
protection_levels.add('all')
- for arg in local_args:
- if arg == '-always':
- options['always'] = True
- elif arg.startswith('-summary'):
- if len(arg) == len('-summary'):
- # fill dummy value to prevent automatic generation
- options['summary'] = None
- else:
- options['summary'] = arg[len('-summary:'):]
- elif arg.startswith('-expiry'):
- if len(arg) == len('-expiry'):
- options['expiry'] = pywikibot.input(
- 'Enter a protection expiry:')
- else:
- options['expiry'] = arg[len('-expiry:'):]
- elif arg.startswith('-images'):
- issue_deprecation_warning('-image', '-imagelinks', 2,
- ArgumentDeprecationWarning,
- since='20140213')
- local_args.append('-imagelinks' + arg[7:])
- elif arg.startswith('-unprotect'):
- default_level = 'all'
- elif arg.startswith('-default'):
- if len(arg) == len('-default'):
- default_level = 'sysop'
- else:
- default_level = arg[len('-default:'):]
- else:
- is_p_type = False
- if arg.startswith('-'):
- delimiter = arg.find(':')
- if delimiter > 0:
- p_type_arg = arg[1:delimiter]
- level = arg[delimiter + 1:]
- if p_type_arg in protection_types:
- protections[p_type_arg] = level
- is_p_type = True
- if not is_p_type:
- if not gen_factory.handleArg(arg):
- raise ValueError('Unknown parameter "{0}"'.format(arg))
- found = arg.find(':')
- if found:
- message_properties.update({'cat': arg[found + 1:],
- 'page': arg[found + 1:]})
- if 'summary' not in options:
- generator_type = arg[1:found] if found > 0 else arg[1:]
+ protection_types = site.protection_types()
+ gen_factory = pagegenerators.GeneratorFactory()
+ for arg in local_args:
+ option, sep, value = arg.partition(':')
+ if not option.startswith('-'):
+ continue
+
+ option = option[1:]
+ if option == 'always':
+ options[option] = True
+ elif option == 'summary':
+ options[option] = value or None
+ elif option == 'expiry':
+ options[option] = value or pywikibot.input(
+ 'Enter a protection expiry:')
+ elif option == 'unprotect':
+ default_level = 'all'
+ elif option == 'default':
+ default_level = value if sep else 'sysop'
+ elif option in protection_types and value:
+ protections[option] = value
+ else:
+ if not gen_factory.handleArg(arg):
+ raise ValueError('Unknown parameter "{0}"'.format(arg))
+ if value:
+ message_properties.update({'cat': value, 'page': value})
+ if 'summary' not in options:
+ generator_type = option
if generator_type in default_summaries:
message_type = default_summaries[generator_type]
@@ -241,10 +219,9 @@
# We are just protecting pages, so we have no need of using a preloading
# page generator to actually get the text of those pages.
if generator:
- if default_level:
- default_level = check_protection_level('Default level',
- default_level,
- protection_levels)
+ default_level = check_protection_level('Default level',
+ default_level,
+ protection_levels)
# set the default value for all
# None (not the string 'none') will be ignored by Site.protect()
combined_protections = {p_type: default_level
--
To view, visit https://gerrit.wikimedia.org/r/508087
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: I9cdb970beaa6cd40ea03ba53ba21220714b2f717
Gerrit-Change-Number: 508087
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)