diff --git a/dev-python/pylons/files/pylons-1.0.1-new-webob-support-2.patch b/dev-python/pylons/files/pylons-1.0.1-new-webob-support-2.patch new file mode 100644 index 000000000..30e1dd7f4 --- /dev/null +++ b/dev-python/pylons/files/pylons-1.0.1-new-webob-support-2.patch @@ -0,0 +1,42 @@ +--- a/pylons/controllers/util.py ++++ b/pylons/controllers/util.py +@@ -174,7 +174,7 @@ def etag_cache(key=None): + response.headers.pop('Content-Type', None) + response.headers.pop('Cache-Control', None) + response.headers.pop('Pragma', None) +- raise status_map[304]().exception ++ raise status_map[304]() + else: + log.debug("ETag didn't match, returning response object") + +@@ -207,7 +207,7 @@ def abort(status_code=None, detail="", h + comment=comment) + log.debug("Aborting request, status: %s, detail: %r, headers: %r, " + "comment: %r", status_code, detail, headers, comment) +- raise exc.exception ++ raise exc + + + def redirect(url, code=302): +@@ -221,4 +221,4 @@ def redirect(url, code=302): + """ + log.debug("Generating %s redirect" % code) + exc = status_map[code] +- raise exc(location=url).exception ++ raise exc(location=url) +--- a/tests/test_units/test_controller.py ++++ b/tests/test_units/test_controller.py +@@ -36,11 +36,11 @@ class BasicWSGIController(WSGIController + def use_redirect(self): + pylons.response.set_cookie('message', 'Hello World') + exc = status_map[301] +- raise exc('/elsewhere').exception ++ raise exc('/elsewhere') + + def use_customnotfound(self): + exc = status_map[404] +- raise exc('Custom not found').exception ++ raise exc('Custom not found') + + def header_check(self): + pylons.response.headers['Content-Type'] = 'text/plain' diff --git a/dev-python/pylons/pylons-1.0.1-r1.ebuild b/dev-python/pylons/pylons-1.0.1-r2.ebuild similarity index 96% rename from dev-python/pylons/pylons-1.0.1-r1.ebuild rename to dev-python/pylons/pylons-1.0.1-r2.ebuild index 0e67b4ab8..e4cb68c85 100644 --- a/dev-python/pylons/pylons-1.0.1-r1.ebuild +++ b/dev-python/pylons/pylons-1.0.1-r2.ebuild @@ -54,6 +54,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { # Sabayon: we need this epatch "${FILESDIR}/${P}-new-webob-support.patch" + epatch "${FILESDIR}/${P}-new-webob-support-2.patch" distutils_src_prepare }