Mercurial > kallithea

comparison kallithea/lib/middleware/simplehg.py @ 8196:e51ad2cd400e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: drop the last uses of safe_str - they are no longer relevant when we don't have a separate unicode type
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 26 Dec 2019 13:16:14 +0100
parents e35373106528
children
comparison
equal deleted inserted replaced
8195:e35373106528 8196:e51ad2cd400e
34 34
35 import mercurial.hgweb 35 import mercurial.hgweb
36 36
37 from kallithea.lib.base import BaseVCSController, get_path_info 37 from kallithea.lib.base import BaseVCSController, get_path_info
38 from kallithea.lib.utils import make_ui 38 from kallithea.lib.utils import make_ui
39 from kallithea.lib.utils2 import safe_bytes, safe_str 39 from kallithea.lib.utils2 import safe_bytes
40 40
41 41
42 log = logging.getLogger(__name__) 42 log = logging.getLogger(__name__)
43 43
44 44
135 135
136 def _make_app(self, parsed_request): 136 def _make_app(self, parsed_request):
137 """ 137 """
138 Make an hgweb wsgi application. 138 Make an hgweb wsgi application.
139 """ 139 """
140 str_repo_name = safe_str(parsed_request.repo_name) 140 repo_name = parsed_request.repo_name
141 repo_path = os.path.join(safe_str(self.basepath), str_repo_name) 141 repo_path = os.path.join(self.basepath, repo_name)
142 baseui = make_ui(repo_path=repo_path) 142 baseui = make_ui(repo_path=repo_path)
143 hgweb_app = mercurial.hgweb.hgweb(safe_bytes(repo_path), name=str_repo_name, baseui=baseui) 143 hgweb_app = mercurial.hgweb.hgweb(safe_bytes(repo_path), name=safe_bytes(repo_name), baseui=baseui)
144 144
145 def wrapper_app(environ, start_response): 145 def wrapper_app(environ, start_response):
146 environ['REPO_NAME'] = str_repo_name # used by mercurial.hgweb.hgweb 146 environ['REPO_NAME'] = repo_name # used by mercurial.hgweb.hgweb
147 return hgweb_app(environ, start_response) 147 return hgweb_app(environ, start_response)
148 148
149 return wrapper_app 149 return wrapper_app