diff --git a/mkdocs/livereload/__init__.py b/mkdocs/livereload/__init__.py index 5ac36e7343..02e83c7385 100644 --- a/mkdocs/livereload/__init__.py +++ b/mkdocs/livereload/__init__.py @@ -200,7 +200,9 @@ def serve_request(self, environ, start_response): return [error_content] def _serve_request(self, environ, start_response): - path = environ["PATH_INFO"] + # https://bugs.python.org/issue16679 + # https://github.com/bottlepy/bottle/blob/f9b1849db4/bottle.py#L984 + path = environ["PATH_INFO"].encode("latin-1").decode("utf-8", "ignore") m = re.fullmatch(r"/livereload/([0-9]+)/[0-9]+", path) if m: diff --git a/mkdocs/tests/livereload_tests.py b/mkdocs/tests/livereload_tests.py index c4d256973c..d3609b6f27 100644 --- a/mkdocs/tests/livereload_tests.py +++ b/mkdocs/tests/livereload_tests.py @@ -304,6 +304,23 @@ def test_serves_modified_index(self, site_dir): _, output = do_request(server, "GET /foo/") self.assertRegex(output, fr"^bbb{SCRIPT_REGEX}$") + @tempdir({"я.html": "aaa", "测试2/index.html": "bbb"}) + def test_serves_with_unicode_characters(self, site_dir): + with testing_server(site_dir) as server: + _, output = do_request(server, "GET /я.html") + self.assertRegex(output, fr"^aaa{SCRIPT_REGEX}$") + _, output = do_request(server, "GET /%D1%8F.html") + self.assertRegex(output, fr"^aaa{SCRIPT_REGEX}$") + + with self.assertLogs("mkdocs.livereload"): + headers, _ = do_request(server, "GET /%D1.html") + self.assertEqual(headers["_status"], "404 Not Found") + + _, output = do_request(server, "GET /测试2/") + self.assertRegex(output, fr"^bbb{SCRIPT_REGEX}$") + _, output = do_request(server, "GET /%E6%B5%8B%E8%AF%952/index.html") + self.assertRegex(output, fr"^bbb{SCRIPT_REGEX}$") + @tempdir() def test_serves_js(self, site_dir): with testing_server(site_dir) as server: