Test non-ascii url-quoted urls don't raise an exception.

This used to work in the previous incarnation of
testbrowser. It now raises a obscure exception on
python 2.7 and seems to work on python 3.

I havn't included a test of the actual results as
I've not investigated exactly what the result
should be.

src/zope/testbrowser/ftests/wsgitestapp.py

@@ -35,7 +35,6 @@ def __call__(self, environ, start_response):
                    '/echo.html': echo,
                    '/redirect.html': redirect,
                    '/@@/testbrowser/forms.html': forms,
-                   '/echo_one.html': echo_one,
                    '/set_header.html': set_header,
                    '/set_cookie.html': set_cookie,
                    '/get_cookie.html': get_cookie,
@@ -44,6 +43,8 @@ def __call__(self, environ, start_response):
                    '/inner/path/set_cookie.html': set_cookie,
                    '/inner/path/get_cookie.html': get_cookie,
                    }.get(req.path_info)
+        if handler is None and req.path_info.endswith('/echo_one.html'):
+            handler = echo_one
         if handler is None and req.path_info.startswith('/@@/testbrowser/'):
             handler = handle_resource
         if handler is None:

src/zope/testbrowser/tests/test_wsgi.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2011 Zope Foundation and Contributors.
@@ -17,7 +18,7 @@
 import zope.testbrowser.wsgi
 from zope.testbrowser.ftests.wsgitestapp import WSGITestApplication
 from zope.testbrowser.testing import demo_app
-from zope.testbrowser._compat import urlencode
+from zope.testbrowser._compat import urlencode, url_quote
 
 
 class SimpleLayer(zope.testbrowser.wsgi.Layer):
@@ -95,6 +96,14 @@ def test_handle_errors(self):
         browser.open('http://localhost/echo_one.html?var=wsgi.handleErrors')
         self.assertEqual(browser.contents, 'False')
 
+    def test_non_ascii_urls(self):
+        teststr = u'~ひらがな'
+        url = "http://localhost/%s/echo_one.html?var=PATH_INFO" % url_quote(teststr.encode('utf-8'))
+        app = WSGITestApplication()
+        browser = zope.testbrowser.wsgi.Browser(wsgi_app=app)
+        browser.handleErrors = False
+        browser.open(url)
+
     def test_binary_content_type(self):
         # regression during webtest porting
         app = WSGITestApplication()