Changes in / [0fa21cd:5cf7630] in OpenWorkouts-current

Files:

• ow/templates/dashboard.pt (modified) (1 diff)
• ow/templates/edit_profile.pt (modified) (1 diff)
• ow/templates/profile.pt (modified) (1 diff)
• ow/tests/views/test_user.py (modified) (3 diffs)
• ow/views/user.py (modified) (3 diffs)
• setup.py (modified) (1 diff)

ow/templates/dashboard.pt

@@ -101 +101 @@
           <tal:c tal:condition="getattr(context, 'picture', None)">
             <a href="" tal:attributes="href request.resource_url(context, 'profile')">
-              <img tal:attributes="src request.resource_path(context, 'picture', query={'size': 200})"
+              <img tal:attributes="src request.resource_path(context, 'picture')"
                    width="450" />
             </a>

ow/templates/edit_profile.pt

@@ -49 +49 @@
                       <label for="current_picture" i18n:translate="">
                           Current picture:</label>
-                      <img id="current_picture"
-                           tal:attributes="src request.resource_path(context, 'picture', query={'size': 200})"
-                           width="150">
+                      <img id="current_picture" tal:attributes="src request.resource_path(context, 'picture')" width="150">
                   </tal:c>
                 </div>

ow/templates/profile.pt

@@ -18 +18 @@
         <div>
           <tal:c tal:condition="getattr(user, 'picture', None)">
-            <img tal:attributes="src request.resource_path(user, 'picture', query={'size': 200})"
+            <img tal:attributes="src request.resource_path(user, 'picture')"
                  width="450" />
           </tal:c>

ow/tests/views/test_user.py

@@ -5 +5 @@
 from shutil import copyfileobj
 from unittest.mock import Mock, patch
-from io import BytesIO
 
 import pytest
@@ -16 +15 @@
 
 from webob.multidict import MultiDict
-
-from PIL import Image
 
 from ow.models.root import OpenWorkouts
@@ -420 +417 @@
         assert response.status_int == 200
         assert response.content_type == 'image'
-        # as we did not pass a specific size as a get parameter, the size is
-        # the same as the original image
-        original_image = Image.open(image_path)
-        returned_image = Image.open(BytesIO(response.body))
-        assert original_image.size == returned_image.size
-
-        # now, ask for a smaller image
-        request.GET['size'] = original_image.size[0] - 20
-        response = user_views.profile_picture(user, request)
-        assert isinstance(response, Response)
-        assert response.status_int == 200
-        assert response.content_type == 'image'
-        # now the size of the original image is bigger
-        returned_image = Image.open(BytesIO(response.body))
-        assert original_image.size > returned_image.size
-
-        # now, ask for a size that is bigger than the original image,
-        # image will be the same size, as we do not "grow" its size
-        request.GET['size'] = original_image.size[0] + 1000
-        response = user_views.profile_picture(user, request)
-        assert isinstance(response, Response)
-        assert response.status_int == 200
-        assert response.content_type == 'image'
-        # now the size of the original image is bigger
-        returned_image = Image.open(BytesIO(response.body))
-        assert original_image.size == returned_image.size
-
 
     def test_edit_profile_get(self, dummy_request, john):

ow/views/user.py

@@ -3 +3 @@
 from datetime import datetime, timezone, timedelta
 from decimal import Decimal
-from io import BytesIO
 
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
@@ -12 +11 @@
 from pyramid_simpleform import Form, State
 from pytz import common_timezones
-from PIL import Image
 
 from ..models.user import User
@@ -214 +212 @@
     permission='view')
 def profile_picture(context, request):
-    if context.picture is None:
-        return HTTPNotFound()
-
-    size = request.GET.get('size', 0)
-    # we will need a tuple, it does not matter if both values are the same,
-    # Pillow will keep aspect ratio
-    size = (int(size), int(size))
-
-    image = Image.open(context.picture.open())
-
-    if size > (0, 0) and size < image.size:
-        # resize only if they are asking for smaller size, prevent
-        # someone asking for a "too big" image
-        image.thumbnail(size)
-
-    body_file = BytesIO()
-    image.save(body_file, format=image.format)
-    return Response(content_type='image', body=body_file.getvalue())
+    return Response(
+        content_type='image',
+        body_file=context.picture.open())
 
 

setup.py

@@ -31 +31 @@
     'pytz',
     'fitparse',
-    'splinter',
-    'Pillow'
+    'splinter'
 ]