jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620774 )
Change subject: [cleanup] Remove unnecessary pass statements
......................................................................
[cleanup] Remove unnecessary pass statements
Change-Id: I995a9ee699e0cdaac680f059e2104bb7050b5224
---
M pywikibot/exceptions.py
1 file changed, 0 insertions(+), 26 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py
index 9da1d8d..a16de1b 100644
--- a/pywikibot/exceptions.py
+++ b/pywikibot/exceptions.py
@@ -225,8 +225,6 @@
# namespaces < 0 aren't supported (T169213)
message = 'Page %s is not supported due to namespace restriction.'
- pass
-
class NoMoveTarget(PageRelatedError):
@@ -234,8 +232,6 @@
message = 'Move target page of %s not found.'
- pass
-
class PageLoadRelatedError(PageRelatedError):
@@ -301,8 +297,6 @@
message = 'Page %s is a redirect page.'
- pass
-
class IsNotRedirectPage(PageRelatedError):
@@ -310,8 +304,6 @@
message = 'Page %s is not a redirect page.'
- pass
-
class CircularRedirect(PageRelatedError):
@@ -363,8 +355,6 @@
message = 'Page %s is locked.'
- pass
-
class LockedNoPage(LockedPage):
@@ -372,8 +362,6 @@
message = 'Page %s does not exist and is locked preventing creation.'
- pass
-
class CascadeLockedPage(LockedPage):
@@ -381,8 +369,6 @@
message = 'Page %s is locked due to cascading protection.'
- pass
-
class SectionError(Error):
@@ -400,8 +386,6 @@
message = 'Page %s could not be created due to parameter nocreate'
- pass
-
class EditConflict(PageSaveRelatedError):
@@ -409,8 +393,6 @@
message = 'Page %s could not be saved due to an edit conflict'
- pass
-
class PageDeletedConflict(EditConflict):
@@ -418,8 +400,6 @@
message = 'Page %s has been deleted since last retrieved.'
- pass
-
class PageCreatedConflict(EditConflict):
@@ -427,8 +407,6 @@
message = 'Page %s has been created since last retrieved.'
- pass
-
class ArticleExistsConflict(EditConflict):
@@ -437,8 +415,6 @@
message = ('Destination article %s already exists and is not a redirect '
'to the source article')
- pass
-
class SpamblacklistError(PageSaveRelatedError):
@@ -459,8 +435,6 @@
message = 'Page %s is title-blacklisted.'
- pass
-
class ServerError(Error):
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620774
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I995a9ee699e0cdaac680f059e2104bb7050b5224
Gerrit-Change-Number: 620774
Gerrit-PatchSet: 1
Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/619146 )
Change subject: [doc] mw 1.14-1.18 are still supported with Pywikibot 4.0.0
......................................................................
[doc] mw 1.14-1.18 are still supported with Pywikibot 4.0.0
Change-Id: Ib0b0aa5882eb4359550a52f038e04a90e9edbd16
---
M pywikibot/site/__init__.py
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
D3r1ck01: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py
index 5052e02..4e3c369 100644
--- a/pywikibot/site/__init__.py
+++ b/pywikibot/site/__init__.py
@@ -2587,13 +2587,15 @@
if MediaWikiVersion(version) < MediaWikiVersion('1.19'):
warn('\n'
- + fill('Support of MediaWiki {version} will be dropped. '
+ + fill('Support of MediaWiki {mw_version} will be dropped. '
'It is recommended to use MediaWiki 1.19 or above. '
- 'You may use every Pywikibot 3.0.X release from '
- 'pypi index or the "python2" release from the '
+ 'You may use every Pywikibot 3.0.X release, Pywikibot '
+ '"{py_version}" or the "python2" release from the '
'repository for older MediaWiki versions. '
'See T245350 for further information.'
- .format(version=version)), FutureWarning)
+ .format(mw_version=version,
+ py_version=pywikibot.__version__)),
+ FutureWarning)
return version
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/619146
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ib0b0aa5882eb4359550a52f038e04a90e9edbd16
Gerrit-Change-Number: 619146
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620497 )
Change subject: prepare next release
......................................................................
prepare next release
Change-Id: Id9554d671e3ddeecdcaab475ad4cd7b31fcc976c
---
M HISTORY.rst
M ROADMAP.rst
M pywikibot/__metadata__.py
3 files changed, 13 insertions(+), 7 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/HISTORY.rst b/HISTORY.rst
index a45f674..80cd9b0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,17 @@
Release history
===============
+4.1.0
+-----
+
+* APISite.loadpageinfo does not discard changes to page content when information was not loaded (T260472)
+* tools.UnicodeType and tools.signature are deprecated
+* BaseBot.stop() method is deprecated in favour of BaseBot.generator.close()
+* Escape bot password correctly (T259488)
+* Bugfixes and improvements
+* Localisation updates
+
+
4.0.0
-----
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 70acf3c..3c62305 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,12 +1,7 @@
Current release changes
~~~~~~~~~~~~~~~~~~~~~~~
-* APISite.loadpageinfo does not discard changes to page content when information was not loaded (T260472)
-* tools.UnicodeType and tools.signature are deprecated
-* BaseBot.stop() method is deprecated in favour of BaseBot.generator.close()
-* Escape bot password correctly (T259488)
-* Bugfixes and improvements
-* Localisation updates
+* (no changes yet)
Future release notes
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index aac3d66..60acacf 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -6,7 +6,7 @@
# Distributed under the terms of the MIT license.
#
__name__ = 'pywikibot'
-__version__ = '4.1.0'
+__version__ = '4.1.1.dev0'
__description__ = 'Python MediaWiki Bot Framework'
__maintainer__ = 'The Pywikibot team'
__maintainer_email__ = 'pywikibot(a)lists.wikimedia.org'
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620497
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Id9554d671e3ddeecdcaab475ad4cd7b31fcc976c
Gerrit-Change-Number: 620497
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620496 )
Change subject: [doc] Update HISTORY.rst which wasn't merged sucessfully
......................................................................
[doc] Update HISTORY.rst which wasn't merged sucessfully
Change-Id: I3bf75a3b92977e50dce57cce5b707648b92e7c3f
---
M HISTORY.rst
1 file changed, 27 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.rst b/HISTORY.rst
index 57bb03f..a45f674 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,33 @@
Release history
===============
+4.0.0
+-----
+
+* Read correct object in SiteLinkCollection.normalizeData (T259426)
+* tools.count and tools classes Counter, OrderedDict and ContextManagerWrapper were removed
+* Deprecate UnicodeMixin and IteratorNextMixin
+* Restrict site module interface
+* EventStreams "since" parameter settings has been fixed
+* Unsupported debug and uploadByUrl parameters of UploadRobot were removed
+* Unported compat decode parameter of Page.title() has been removed
+* Wikihow family file was added (T249814)
+* Improve performance of CosmeticChangesToolkit.translateMagicWords
+* Prohibit positional arguments with Page.title()
+* Functions dealing with stars list were removed
+* Some pagegenerators functions were deprecated which should be replaced by site generators
+* LogEntry became a UserDict; all content can be accessed by its key
+* URLs for new toolforge.org domain were updated
+* pywikibot.__release__ was deprecated
+* Use one central point for framework version (T106121, T171886, T197936, T253719)
+* rvtoken parameter of Site.loadrevisions() and Page.revisions() has been dropped (T74763)
+* getFilesFromAnHash and getImagesFromAnHash Site methods have been removed
+* Site and Page methods deprecated for 10 years or longer have been removed
+* Support for Python 2 and 3.4 has been dropped (T213287, T239542)
+* Bugfixes and improvements
+* Localisation updates
+
+
3.0.20200703
------------
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620496
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: stable
Gerrit-Change-Id: I3bf75a3b92977e50dce57cce5b707648b92e7c3f
Gerrit-Change-Number: 620496
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620494 )
Change subject: Merge branch 'master' into stable
......................................................................
Merge branch 'master' into stable
Change-Id: I755b982d325edab0f40bd1a3eec245bc59e40a3d
---
M ROADMAP.rst
M pywikibot/__metadata__.py
3 files changed, 0 insertions(+), 27 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/ROADMAP.rst b/ROADMAP.rst
index a319d0e..70acf3c 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,33 +1,10 @@
Current release changes
~~~~~~~~~~~~~~~~~~~~~~~
-<<<<<<< HEAD (3644c4 Update git submodules)
-* Read correct object in SiteLinkCollection.normalizeData (T259426)
-* tools.count and tools classes Counter, OrderedDict and ContextManagerWrapper were removed
-* Deprecate UnicodeMixin and IteratorNextMixin
-* Restrict site module interface
-* EventStreams "since" parameter settings has been fixed
-* Unsupported debug and uploadByUrl parameters of UploadRobot were removed
-* Unported compat decode parameter of Page.title() has been removed
-* Wikihow family file was added (T249814)
-* Improve performance of CosmeticChangesToolkit.translateMagicWords
-* Prohibit positional arguments with Page.title()
-* Functions dealing with stars list were removed
-* Some pagegenerators functions were deprecated which should be replaced by site generators
-* LogEntry became a UserDict; all content can be accessed by its key
-* URLs for new toolforge.org domain were updated
-* pywikibot.__release__ was deprecated
-* Use one central point for framework version (T106121, T171886, T197936, T253719)
-* rvtoken parameter of Site.loadrevisions() and Page.revisions() has been dropped (T74763)
-* getFilesFromAnHash and getImagesFromAnHash Site methods have been removed
-* Site and Page methods deprecated for 10 years or longer have been removed
-* Support for Python 2 and 3.4 has been dropped (T213287, T239542)
-=======
* APISite.loadpageinfo does not discard changes to page content when information was not loaded (T260472)
* tools.UnicodeType and tools.signature are deprecated
* BaseBot.stop() method is deprecated in favour of BaseBot.generator.close()
* Escape bot password correctly (T259488)
->>>>>>> BRANCH (704c5e Merge "[4.1] publish current release")
* Bugfixes and improvements
* Localisation updates
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 4ec5802..aac3d66 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -6,11 +6,7 @@
# Distributed under the terms of the MIT license.
#
__name__ = 'pywikibot'
-<<<<<<< HEAD (3644c4 Update git submodules)
-__version__ = '4.0.0'
-=======
__version__ = '4.1.0'
->>>>>>> BRANCH (704c5e Merge "[4.1] publish current release")
__description__ = 'Python MediaWiki Bot Framework'
__maintainer__ = 'The Pywikibot team'
__maintainer_email__ = 'pywikibot(a)lists.wikimedia.org'
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620494
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: stable
Gerrit-Change-Id: I755b982d325edab0f40bd1a3eec245bc59e40a3d
Gerrit-Change-Number: 620494
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged