Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin

mediagoblin/media_types/ascii/processing.py

@@ -143,11 +143,8 @@ class CommonAsciiProcessor(MediaProcessor):
             thumb = converter._create_image(
                 orig_file.read())
 
-            with open(tmp_thumb, 'w') as thumb_file:
-                thumb.thumbnail(
-                    thumb_size,
-                    Image.ANTIALIAS)
-                thumb.save(thumb_file)
+            thumb.thumbnail(thumb_size, Image.ANTIALIAS)
+            thumb.save(tmp_thumb);
 
             thumb_info = {'font': font,
                           'width': thumb_size[0],

mediagoblin/media_types/image/processing.py

@@ -77,8 +77,7 @@ def resize_image(entry, resized, keyname, target_name, new_size,
 
     # Copy the new file to the conversion subdir, then remotely.
     tmp_resized_filename = os.path.join(workdir, target_name)
-    with open(tmp_resized_filename, 'wb') as resized_file:
-        resized.save(resized_file, quality=quality)
+    resized.save(tmp_resized_filename, quality=quality)
     store_public(entry, keyname, tmp_resized_filename, target_name)
 
     # store the thumb/medium info

mediagoblin/plugins/basic_auth/views.py

@@ -63,7 +63,8 @@ def forgot_password(request):
             messages.add_message(request,
                                  messages.WARNING,
                                  _("Couldn't find someone with that username."))
-            return redirect(request, 'mediagoblin.auth.forgot_password')
+            return redirect(request,
+                            'mediagoblin.plugins.basic_auth.forgot_password')
 
         success_message = _("An email has been sent with instructions "
                             "on how to change your password.")