Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386348 )
Change subject: Upgrade to 1.7
......................................................................
Upgrade to 1.7
Bug: T178974
Bug: T178072
Change-Id: I51f46f0c46b7a5b3a884888ce0a0130a4331be58
---
M debian/changelog
M setup.py
M tests/integration/test_images_handler.py
M wikimedia_thumbor/engine/imagemagick/imagemagick.py
M wikimedia_thumbor/handler/images/images.py
5 files changed, 25 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/python-thumbor-wikimedia
refs/changes/48/386348/1
diff --git a/debian/changelog b/debian/changelog
index 73eae37..0a00260 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-thumbor-wikimedia (1.7-1) jessie-wikimedia; urgency=low
+
+ * New upstream release
+
+ -- Gilles Dubuc <gil...@wikimedia.org> Wed, 25 Oct 2017 10:30:00 +0000
+
python-thumbor-wikimedia (1.6-1) jessie-wikimedia; urgency=low
* New upstream release
diff --git a/setup.py b/setup.py
index 188d79f..57716a5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name='wikimedia_thumbor',
- version='1.6',
+ version='1.7',
url='https://phabricator.wikimedia.org/diffusion/THMBREXT/',
license='MIT',
author='Gilles Dubuc, Wikimedia Foundation',
diff --git a/tests/integration/test_images_handler.py
b/tests/integration/test_images_handler.py
index 025b0ff..135ffed 100644
--- a/tests/integration/test_images_handler.py
+++ b/tests/integration/test_images_handler.py
@@ -209,6 +209,18 @@
'format(png):lang(fr)',
'inline;filename*=UTF-8\'\'1Mcolors.svg.png'
)
+ self.run_and_check_headers(
+
'/wikipedia/en/thumb/d/d3/1Mcolors.svg/langzh-hans-400px-1Mcolors.svg.png',
+ 'File:1Mcolors.svg',
+ 'wikipedia-en-local-public.d3',
+ 'd/d3/1Mcolors.svg',
+ 'wikipedia-en-local-thumb.d3',
+ 'thumbor/d/d3/1Mcolors.svg/langzh-hans-400px-1Mcolors.svg.png',
+ '400',
+
'http://swifthost/swift/v1/api/path/wikipedia-en-local-public.d3/d/d3/1Mcolors.svg',
+ 'format(png):lang(zh-hans)',
+ 'inline;filename*=UTF-8\'\'1Mcolors.svg.png'
+ )
def test_seek(self):
self.run_and_check_headers(
diff --git a/wikimedia_thumbor/engine/imagemagick/imagemagick.py
b/wikimedia_thumbor/engine/imagemagick/imagemagick.py
index 4b041cd..ee1bdaa 100644
--- a/wikimedia_thumbor/engine/imagemagick/imagemagick.py
+++ b/wikimedia_thumbor/engine/imagemagick/imagemagick.py
@@ -11,6 +11,7 @@
# ImageMagick engine
+import logging
from tempfile import NamedTemporaryFile
from pyexiv2 import ImageMetadata
@@ -123,7 +124,10 @@
metadata = ImageMetadata(input_temp_file.name)
try:
+ # T178072 pyexviv2 writes to stderr even if the exception is caught
+ logging.disable(logging.ERROR)
metadata.read()
+ logging.disable(logging.NOTSET)
if 'Exif.Image.Orientation' in metadata.exif_keys:
# Distinctive key name to avoid colliding with
EXIF_FIELDS_TO_KEEP
self.exif['Pyexiv2Orientation'] =
metadata.get('Exif.Image.Orientation').value
diff --git a/wikimedia_thumbor/handler/images/images.py
b/wikimedia_thumbor/handler/images/images.py
index 9940305..3625506 100644
--- a/wikimedia_thumbor/handler/images/images.py
+++ b/wikimedia_thumbor/handler/images/images.py
@@ -132,11 +132,11 @@
r'(?:(?P<lossy>lossy-))?'
r'(?:(?P<lossless>lossless-))?'
r'(?:page(?P<page>\d+)-)?'
- r'(?:lang(?P<lang>[a-zA-Z]+)-)?'
+ r'(?:lang(?P<lang>[0-9a-zA-Z-]+)-)?'
r'(?P<width>\d+)px-'
r'(?:(?:seek=|seek%3D)(?P<seek>\d+)-)?'
r'(?P<end>[^/]+)'
- r'\.(?P<format>[a-zA-Z]+)'
+ r'\.(?P<format>[0-9a-zA-Z]+)'
)
def generate_save_swift_path(self, kw):
--
To view, visit https://gerrit.wikimedia.org/r/386348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51f46f0c46b7a5b3a884888ce0a0130a4331be58
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-thumbor-wikimedia
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
