From 0482bd06bcde5601ea2ab3b01b774e03f92160b7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 12 Jul 2010 13:50:49 +0000 Subject: - New internal exception: ``repoze.bfg.exceptions.URLDecodeError``. This URL is a subclass of the built-in Python exception named ``UnicodeDecodeError``. - When decoding a URL segment to Unicode fails, the exception raised is now ``repoze.bfg.exceptions.URLDecodeError`` instead of ``UnicodeDecodeError``. This makes it possible to register an exception view invoked specifically when ``repoze.bfg`` cannot decode a URL. --- repoze/bfg/urldispatch.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'repoze/bfg/urldispatch.py') diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index 7a77fec5b..80880d8f0 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -3,6 +3,7 @@ from urllib import unquote from repoze.bfg.compat import all from repoze.bfg.encode import url_quote +from repoze.bfg.exceptions import URLDecodeError from repoze.bfg.traversal import traversal_path from repoze.bfg.traversal import quote_path_segment @@ -102,7 +103,15 @@ def _compile_route(route): if k == star: d[k] = traversal_path(v) else: - d[k] = unquote(v).decode('utf-8') + encoded = unquote(v) + try: + d[k] = encoded.decode('utf-8') + except UnicodeDecodeError, e: + raise URLDecodeError( + e.encoding, e.object, e.start, e.end, e.reason + ) + + return d -- cgit v1.2.3