Mercurial > public > mercurial-scm > hg

comparison mercurial/hgweb/common.py @ 30615:bb77654dc7ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.sep with pycompat.ossep (part 3 of 4)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Dec 2016 20:14:24 +0530
parents 075146e85bb6
children bcf4a975f93d
comparison
equal deleted inserted replaced
30614:cfe66dcf45c0 30615:bb77654dc7ae
10 10
11 import errno 11 import errno
12 import mimetypes 12 import mimetypes
13 import os 13 import os
14 14
15 from .. import util 15 from .. import (
16 pycompat,
17 util,
18 )
16 19
17 httpserver = util.httpserver 20 httpserver = util.httpserver
18 21
19 HTTP_OK = 200 22 HTTP_OK = 200
20 HTTP_NOT_MODIFIED = 304 23 HTTP_NOT_MODIFIED = 304
137 140
138 """ 141 """
139 parts = fname.split('/') 142 parts = fname.split('/')
140 for part in parts: 143 for part in parts:
141 if (part in ('', os.curdir, os.pardir) or 144 if (part in ('', os.curdir, os.pardir) or
142 os.sep in part or os.altsep is not None and os.altsep in part): 145 pycompat.ossep in part or
146 os.altsep is not None and os.altsep in part):
143 return 147 return
144 fpath = os.path.join(*parts) 148 fpath = os.path.join(*parts)
145 if isinstance(directory, str): 149 if isinstance(directory, str):
146 directory = [directory] 150 directory = [directory]
147 for d in directory: 151 for d in directory: