Mercurial > hg
comparison hgext/convert/cvsps.py @ 30616:6f9fcd29e290
py3: replace os.sep with pycompat.ossep (part 4 of 4)
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 17 Dec 2016 20:24:46 +0530 |
parents | b501579147f1 |
children | 1c5cbf28f007 |
comparison
equal
deleted
inserted
replaced
30615:bb77654dc7ae | 30616:6f9fcd29e290 |
---|---|
10 import re | 10 import re |
11 | 11 |
12 from mercurial.i18n import _ | 12 from mercurial.i18n import _ |
13 from mercurial import ( | 13 from mercurial import ( |
14 hook, | 14 hook, |
15 pycompat, | |
15 util, | 16 util, |
16 ) | 17 ) |
17 | 18 |
18 pickle = util.pickle | 19 pickle = util.pickle |
19 | 20 |
134 if prefix == ".": | 135 if prefix == ".": |
135 prefix = "" | 136 prefix = "" |
136 except IOError: | 137 except IOError: |
137 raise logerror(_('not a CVS sandbox')) | 138 raise logerror(_('not a CVS sandbox')) |
138 | 139 |
139 if prefix and not prefix.endswith(os.sep): | 140 if prefix and not prefix.endswith(pycompat.ossep): |
140 prefix += os.sep | 141 prefix += pycompat.ossep |
141 | 142 |
142 # Use the Root file in the sandbox, if it exists | 143 # Use the Root file in the sandbox, if it exists |
143 try: | 144 try: |
144 root = open(os.path.join('CVS','Root')).read().strip() | 145 root = open(os.path.join('CVS','Root')).read().strip() |
145 except IOError: | 146 except IOError: |