jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393433 )
Change subject: setup.py: Use flickrapi<2.3.1 for Python 3.3
......................................................................
setup.py: Use flickrapi<2.3.1 for Python 3.3
Bug: T181351
Change-Id: I848bf7c30e7bcf0102494ccfd438422191edc1ad
---
M requirements.txt
M setup.py
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/requirements.txt b/requirements.txt
index 98c9c0d..13598af 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -71,7 +71,8 @@
# If you see that on Python 2, change this to flickrapi==1.4.5
# On Python 3, force pip to install requests 2.2.1, or remove flickrapi below.
flickrapi>=1.4.5,<2 ; python_version < '2.7'
-flickrapi ; python_version >= '2.7'
+flickrapi<2.3.1 ; python_version == '3.3'
+flickrapi ; python_version >= '2.7' and python_version != '3.3'
# incomplete core component botirc
irc ; python_version > '2.6'
diff --git a/setup.py b/setup.py
index efa5dc8..aa28872 100644
--- a/setup.py
+++ b/setup.py
@@ -92,8 +92,12 @@
# and will be first packaged for Fedora Core 21.
# flickrapi 1.4.x does not run on Python 3, and setuptools can only
# select flickrapi 2.x for Python 3 installs.
-script_deps['flickrripper.py'].append(
- 'flickrapi>=1.4.5,<2' if PY26 else 'flickrapi')
+# flickrapi 2.3.1 dropped support for Python 3.3.
+if PYTHON_VERSION[:2] == (3, 3):
+ script_deps['flickrripper.py'].append('flickrapi<2.3.1')
+else:
+ script_deps['flickrripper.py'].append(
+ 'flickrapi>=1.4.5,<2' if PY26 else 'flickrapi')
# lunatic-python is only available for Linux
if sys.platform.startswith('linux'):
--
To view, visit https://gerrit.wikimedia.org/r/393433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I848bf7c30e7bcf0102494ccfd438422191edc1ad
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(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/390777 )
Change subject: [bugfix] keeping categories from non-english sites
......................................................................
[bugfix] keeping categories from non-english sites
Adds the site for the text on the call to textlib.getCategoryLinks
to keep categories already in the page when using CategoryAddBot
(ammend for negliting to type a self.)
Bug: T180289
Change-Id: I361a17a82931b09a7a8659d02b9a5eea21802c46
---
M scripts/category.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
Zoranzoki21: Looks good to me, but someone else must approve
diff --git a/scripts/category.py b/scripts/category.py
index c244114..263b92d 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -362,7 +362,7 @@
return
# store old text, so we don't have reload it every time
old_text = text
- cats = textlib.getCategoryLinks(text)
+ cats = textlib.getCategoryLinks(text, self.current_page.site)
pywikibot.output(u"Current categories:")
for cat in cats:
pywikibot.output(u"* %s" % cat.title())
--
To view, visit https://gerrit.wikimedia.org/r/390777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I361a17a82931b09a7a8659d02b9a5eea21802c46
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Chico Venancio <chicocvenancio(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(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/390582 )
Change subject: [Bugfix] Do not capitalize ß in first_upper
......................................................................
[Bugfix] Do not capitalize ß in first_upper
Bug: T179115
Change-Id: Iec871eefcbcc28059109d155691f888089c99e0f
---
M pywikibot/tools/__init__.py
M tests/cosmetic_changes_tests.py
2 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
Zoranzoki21: Looks good to me, but someone else must approve
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 8f94f77..c3e2d6f 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -450,8 +450,14 @@
Return a string with the first character capitalized.
Empty strings are supported. The original string is not changed.
+
+ Warning: Python 2 and 3 capitalize "ß" differently. MediaWiki does
+ not capitalize ß at the beginning. See T179115.
"""
- return string[:1].upper() + string[1:]
+ first = string[:1]
+ if first != 'ß':
+ first = first.upper()
+ return first + string[1:]
def normalize_username(username):
diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py
index 83d2c4e..6900b3e 100644
--- a/tests/cosmetic_changes_tests.py
+++ b/tests/cosmetic_changes_tests.py
@@ -316,6 +316,8 @@
self.cct.cleanUpLinks('[[sand|sand]]box'))
self.assertEqual('[[Sand|demospace]]',
self.cct.cleanUpLinks('[[sand|demo]]space'))
+ self.assertEqual('[[ß|Eszett]]',
+ self.cct.cleanUpLinks('[[ß|Eszett]]'))
self.assertEqual('[[Title]]',
self.cct.cleanUpLinks('[[title|Title]]'))
self.assertEqual('[[Sand]]box',
--
To view, visit https://gerrit.wikimedia.org/r/390582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec871eefcbcc28059109d155691f888089c99e0f
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>