jenkins-bot has submitted this change and it was merged.
Change subject: Only set mwparserfromhell as a dependency for non-Windows users
......................................................................
Only set mwparserfromhell as a dependency for non-Windows users
Bug: 66010
Change-Id: Ice7a6650e03d743f72daabd51511a9af32eb0a5d
---
M setup.py
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 5752e0b..357a1fe 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,12 @@
print("ERROR: Python 3.3 or higher is required!")
sys.exit(1)
+dependencies = ['httplib2>=0.6.0']
+if os.name != 'nt':
+ # See bug 66010, Windows users will have issues
+ # when trying to build the C modules.
+ dependencies.append('mwparserfromhell>=0.3.3')
+
class pwb_install(install.install):
"""
@@ -65,10 +71,7 @@
[package
for package in find_packages()
if package.startswith('pywikibot.')],
- install_requires=[
- 'httplib2>=0.6.0',
- 'mwparserfromhell>=0.3.3'
- ],
+ install_requires=dependencies,
dependency_links=[
'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format=gz…'
],
--
To view, visit https://gerrit.wikimedia.org/r/136702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice7a6650e03d743f72daabd51511a9af32eb0a5d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 66012) Reorder inheritance of Error class
......................................................................
(bug 66012) Reorder inheritance of Error class
- UnicodeMixin must be the first object Error class is derived from
- keep lines < 80 chars
Change-Id: I37790365f4224bf83cf4a261ce751c405f3535cb
---
M pywikibot/exceptions.py
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py
index d9e869a..17296a2 100644
--- a/pywikibot/exceptions.py
+++ b/pywikibot/exceptions.py
@@ -16,8 +16,9 @@
# will be needed in the rewrite.
-class Error(Exception, UnicodeMixin):
+class Error(UnicodeMixin, Exception):
"""Wikipedia error"""
+ # NOTE: UnicodeMixin must be the first object Error class is derived from.
def __init__(self, arg):
self.unicode = arg
@@ -102,9 +103,12 @@
class SpamfilterError(PageNotSaved):
- """Saving the page has failed because the MediaWiki spam filter detected a blacklisted URL."""
+ """Saving the page has failed because the MediaWiki spam filter detected a
+ blacklisted URL.
+ """
def __init__(self, arg):
- super(SpamfilterError, self).__init__(u'MediaWiki spam filter has been triggered')
+ super(SpamfilterError, self).__init__(
+ u'MediaWiki spam filter has been triggered')
self.url = arg
self.args = arg,
--
To view, visit https://gerrit.wikimedia.org/r/136719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37790365f4224bf83cf4a261ce751c405f3535cb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: backport Ic8ef2868ef9c55a1cec57a17f5601652918a62c7 from core
......................................................................
backport Ic8ef2868ef9c55a1cec57a17f5601652918a62c7 from core
bug: 55161
Change-Id: Ib5def7736b3ed7f682e880438ab21d5f5253ce6e
---
M cosmetic_changes.py
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/cosmetic_changes.py b/cosmetic_changes.py
index 528104c..b15c226 100644
--- a/cosmetic_changes.py
+++ b/cosmetic_changes.py
@@ -578,10 +578,9 @@
German, and French Wikipedia. It might be that it is not wanted on other
wikis. If there are any complaints, please file a bug report.
"""
- exceptions = ['comment', 'math', 'nowiki', 'pre', 'source', 'template',
- 'timeline']
- if not (self.redirect or self.template) and \
- pywikibot.calledModuleName() != 'capitalize_redirects':
+ if not self.template:
+ exceptions = ['comment', 'math', 'nowiki', 'pre', 'source', 'template',
+ 'timeline', self.site.redirectRegex()]
text = pywikibot.replaceExcept(
text,
r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)',
--
To view, visit https://gerrit.wikimedia.org/r/136627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5def7736b3ed7f682e880438ab21d5f5253ce6e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>