From bd0b5daa44691c8cf72ef2ff5a8cdc3b01490722 Mon Sep 17 00:00:00 2001 From: Rodney Ewing Date: Mon, 19 Aug 2013 14:33:07 -0700 Subject: [PATCH] -skip persona test is requests is not installed - should use request.urlgen for location --- mediagoblin/tests/test_persona.py | 2 ++ mediagoblin/user_pages/views.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mediagoblin/tests/test_persona.py b/mediagoblin/tests/test_persona.py index ce795258..919877c9 100644 --- a/mediagoblin/tests/test_persona.py +++ b/mediagoblin/tests/test_persona.py @@ -18,6 +18,8 @@ import pkg_resources import pytest import mock +pytest.importorskip("requests") + from mediagoblin import mg_globals from mediagoblin.db.base import Session from mediagoblin.tests.tools import get_app diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 9d3cb08b..49691a29 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -305,8 +305,9 @@ def media_confirm_delete(request, media): if not location: location=media.url_to_prev(request.urlgen) if not location: - location="mediagoblin.user_pages.user_home" - return redirect(request, location=location, user=username) + location=request.urlgen("mediagoblin.user_pages.user_home", + user=username) + return redirect(request, location=location) else: messages.add_message( request, messages.ERROR, -- 2.25.1