This fixes #64 but only for Python 3; Python 2 fails the test. I'm cl…

…ueless about what the right thing to do is.

waitress/parser.py

@@ -253,7 +253,10 @@ def close(self):
 def split_uri(uri):
     # urlsplit handles byte input by returning bytes on py3, so
     # scheme, netloc, path, query, and fragment are bytes
-    scheme, netloc, path, query, fragment = urlparse.urlsplit(uri)
+    try:
+        scheme, netloc, path, query, fragment = urlparse.urlsplit(uri)
+    except UnicodeError:
+        raise ParsingError('Bad URI')
     return (
         tostr(scheme),
         tostr(netloc),

waitress/tests/test_parser.py

@@ -249,6 +249,11 @@ def test_split_url_https(self):
         self.assertEqual(self.proxy_scheme, 'https')
         self.assertEqual(self.proxy_netloc, 'localhost:8080')
 
+    def test_split_uri_unicode_error_raises_parsing_error(self):
+        # See https://github.com/Pylons/waitress/issues/64
+        from waitress.parser import ParsingError
+        self.assertRaises(ParsingError, self._callFUT, b'/\xd0')
+
 class Test_get_header_lines(unittest.TestCase):
 
     def _callFUT(self, data):