From d7a994e9e4af6bfee0c6f0816156893be99e92e4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 1 Sep 2012 10:23:45 +0200 Subject: Fix bad http header conversion when getting the root uri --- chimere/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chimere/views.py b/chimere/views.py index 4374781..eeacd81 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -56,8 +56,9 @@ def get_base_uri(request): base_uri = 'https://' if 'SERVER_NAME' in request.META: base_uri += request.META['SERVER_NAME'] - if 'SERVER_PORT' in request.META: - base_uri += ":" + request.META['SERVER_PORT'] + if 'SERVER_PORT' in request.META and \ + str(request.META['SERVER_PORT']) != '80': + base_uri += ":" + str(request.META['SERVER_PORT']) return base_uri #TODO: convert to requestcontext -- cgit v1.2.3 From 36a48459497807c9299ef953f6fb8f6f8aa13f3d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 3 Sep 2012 01:14:43 +0200 Subject: Fix picture rotation for old pyexiv2 API --- chimere/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chimere/models.py b/chimere/models.py index 85d4055..c6c4498 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -580,16 +580,17 @@ def picturefile_post_save(sender, **kwargs): if kwargs['created']: filename = picturefile.picture.path - metadata = None + metadata, orientation = None, None if PYEXIV2_OLD_API: metadata = pyexiv2.Image(filename) metadata.readMetadata() + orientation = metadata['Exif.Image.Orientation'] \ + if 'Exif.Image.Orientation' in metadata.exifKeys() else None else: metadata = pyexiv2.ImageMetadata(filename) metadata.read() - orientation = metadata['Exif.Image.Orientation'].value \ + orientation = metadata['Exif.Image.Orientation'].value \ if 'Exif.Image.Orientation' in metadata else None - print "orientation", orientation if orientation and orientation in IMAGE_EXIF_ORIENTATION_MAP \ and orientation > 1: metadata['Exif.Image.Orientation'] = 1 -- cgit v1.2.3