diff -r d7f3f745f20c -r 44b26349127b mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py Sun May 29 12:28:31 2022 +0200 +++ b/mercurial/hgweb/server.py Sun May 29 12:38:54 2022 +0200 @@ -8,7 +8,6 @@ import errno -import importlib import os import socket import sys @@ -404,26 +403,9 @@ cls = MercurialHTTPServer # ugly hack due to python issue5853 (for threaded use) - try: - import mimetypes - - mimetypes.init() - except UnicodeDecodeError: - # Python 2.x's mimetypes module attempts to decode strings - # from Windows' ANSI APIs as ascii (fail), then re-encode them - # as ascii (clown fail), because the default Python Unicode - # codec is hardcoded as ascii. + import mimetypes - sys.argv # unwrap demand-loader so that reload() works - # resurrect sys.setdefaultencoding() - try: - importlib.reload(sys) - except AttributeError: - reload(sys) - oldenc = sys.getdefaultencoding() - sys.setdefaultencoding(b"latin1") # or any full 8-bit encoding - mimetypes.init() - sys.setdefaultencoding(oldenc) + mimetypes.init() address = ui.config(b'web', b'address') port = urlutil.getport(ui.config(b'web', b'port'))