##// END OF EJS Templates
py3: make sure regexes are bytes...
Pulkit Goyal -
r36473:9e3cb58c default
parent child Browse files
Show More
@@ -170,7 +170,7 b' def createlog(ui, directory=None, root="'
170 # /pserver/user/server/path
170 # /pserver/user/server/path
171 # are mapped to different cache file names.
171 # are mapped to different cache file names.
172 cachefile = root.split(":") + [directory, "cache"]
172 cachefile = root.split(":") + [directory, "cache"]
173 cachefile = ['-'.join(re.findall(r'\w+', s)) for s in cachefile if s]
173 cachefile = ['-'.join(re.findall(br'\w+', s)) for s in cachefile if s]
174 cachefile = os.path.join(cachedir,
174 cachefile = os.path.join(cachedir,
175 '.'.join([s for s in cachefile if s]))
175 '.'.join([s for s in cachefile if s]))
176
176
@@ -1129,7 +1129,7 b' class svn_sink(converter_sink, commandli'
1129 self.wc = os.path.realpath(path)
1129 self.wc = os.path.realpath(path)
1130 self.run0('update')
1130 self.run0('update')
1131 else:
1131 else:
1132 if not re.search(r'^(file|http|https|svn|svn\+ssh)\://', path):
1132 if not re.search(br'^(file|http|https|svn|svn\+ssh)\://', path):
1133 path = os.path.realpath(path)
1133 path = os.path.realpath(path)
1134 if os.path.isdir(os.path.dirname(path)):
1134 if os.path.isdir(os.path.dirname(path)):
1135 if not os.path.exists(os.path.join(path, 'db', 'fs-type')):
1135 if not os.path.exists(os.path.join(path, 'db', 'fs-type')):
@@ -27,7 +27,7 b' from mercurial import ('
27 from ..largefiles import lfutil
27 from ..largefiles import lfutil
28
28
29 # 64 bytes for SHA256
29 # 64 bytes for SHA256
30 _lfsre = re.compile(r'\A[a-f0-9]{64}\Z')
30 _lfsre = re.compile(br'\A[a-f0-9]{64}\Z')
31
31
32 class lfsvfs(vfsmod.vfs):
32 class lfsvfs(vfsmod.vfs):
33 def join(self, path):
33 def join(self, path):
General Comments 0
You need to be logged in to leave comments. Login now