jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/482419 )
Change subject: Revert "[bugfix] import MWSite in generate_family_file.py for tests"
......................................................................
Revert "[bugfix] import MWSite in generate_family_file.py for tests"
pwb_tests and script_tests are failing.
This reverts commit 4cd790567da33ebd29a21f24b8ce43b33e733acb.
Bug: T212988
Change-Id: I0d8e50ed65f6c95e2a2801ff9fb3397b780b1913
---
M generate_family_file.py
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_family_file.py b/generate_family_file.py
index 4e6ff98..a73e3ec 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -3,7 +3,7 @@
"""This script generates a family file from a given URL."""
#
# (C) Merlijn van Deen, 2010-2013
-# (C) Pywikibot team, 2010-2019
+# (C) Pywikibot team, 2010-2018
#
# Distributed under the terms of the MIT license
#
@@ -224,6 +224,3 @@
sep=os.sep))
FamilyFileGenerator(*sys.argv[1:]).run()
-else:
- # for testing purposes
- from pywikibot.site_detect import MWSite as Wiki # noqa: E402
--
To view, visit https://gerrit.wikimedia.org/r/482419
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: I0d8e50ed65f6c95e2a2801ff9fb3397b780b1913
Gerrit-Change-Number: 482419
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
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/482407 )
Change subject: [bugfix] import MWSite in generate_family_file.py for tests
......................................................................
[bugfix] import MWSite in generate_family_file.py for tests
Bug: T212998
Change-Id: Ib5cac9f2fda20ace52cbdfef1488e386dab25873
---
M generate_family_file.py
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_family_file.py b/generate_family_file.py
index a73e3ec..4e6ff98 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -3,7 +3,7 @@
"""This script generates a family file from a given URL."""
#
# (C) Merlijn van Deen, 2010-2013
-# (C) Pywikibot team, 2010-2018
+# (C) Pywikibot team, 2010-2019
#
# Distributed under the terms of the MIT license
#
@@ -224,3 +224,6 @@
sep=os.sep))
FamilyFileGenerator(*sys.argv[1:]).run()
+else:
+ # for testing purposes
+ from pywikibot.site_detect import MWSite as Wiki # noqa: E402
--
To view, visit https://gerrit.wikimedia.org/r/482407
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: Ib5cac9f2fda20ace52cbdfef1488e386dab25873
Gerrit-Change-Number: 482407
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462144 )
Change subject: [cleanup] Remove handling of old -dry parameter
......................................................................
[cleanup] Remove handling of old -dry parameter
Bug: T205190
Change-Id: If18b60a417059b654917b1bb774e952075916970
---
M scripts/basic.py
1 file changed, 0 insertions(+), 30 deletions(-)
Approvals:
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/basic.py b/scripts/basic.py
index e5cd63d..282c2e7 100755
--- a/scripts/basic.py
+++ b/scripts/basic.py
@@ -36,7 +36,6 @@
from pywikibot.bot import (
SingleSiteBot, ExistingPageBot, NoRedirectPageBot, AutomaticTWSummaryBot)
-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.
@@ -88,38 +87,9 @@
# call initializer of the super class
super(BasicBot, self).__init__(site=True, **kwargs)
- # handle old -dry parameter
- self._handle_dry_param(**kwargs)
-
# assign the generator to the bot
self.generator = generator
- def _handle_dry_param(self, **kwargs):
- """
- Read the dry parameter and set the simulate variable instead.
-
- This is a private method. It prints a deprecation warning for old
- -dry paramter and sets the global simulate variable and informs
- the user about this setting.
-
- The constuctor of the super class ignores it because it is not
- part of self.availableOptions.
-
- @note: You should ommit this method in your own application.
-
- @keyword dry: deprecated option to prevent changes on live wiki.
- Use -simulate instead.
- @type dry: bool
- """
- if 'dry' in kwargs:
- issue_deprecation_warning('dry argument',
- 'pywikibot.config.simulate', 1,
- warning_class=FutureWarning,
- since='20160124')
- # use simulate variable instead
- pywikibot.config.simulate = True
- pywikibot.output('config.simulate was set to True')
-
def treat_page(self):
"""Load the given page, do some changes, and save it."""
text = self.current_page.text
--
To view, visit https://gerrit.wikimedia.org/r/462144
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: If18b60a417059b654917b1bb774e952075916970
Gerrit-Change-Number: 462144
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/482313 )
Change subject: [bugfix] Fix doc warnings introduced in a5c9ce93
......................................................................
[bugfix] Fix doc warnings introduced in a5c9ce93
Change-Id: Ic4c21cf033a04221103cc3645de2eeba3244fe77
---
M scripts/touch.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
JJMC89: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/touch.py b/scripts/touch.py
index 24f5605..edd69f8 100755
--- a/scripts/touch.py
+++ b/scripts/touch.py
@@ -13,9 +13,11 @@
-purge Do not touch but purge the page
Touch arguments:
+
-botflag Force botflag in case of edits with changes.
Purge arguments:
+
-converttitles Convert titles to other variants if necessary
-forcelinkupdate Update the links tables
-forcerecursivelinkupdate Update the links table, and update the links tables
--
To view, visit https://gerrit.wikimedia.org/r/482313
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: Ic4c21cf033a04221103cc3645de2eeba3244fe77
Gerrit-Change-Number: 482313
Gerrit-PatchSet: 2
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)