comparison mercurial/wireprotoframing.py @ 37084:f0b6fbea00cf

stringutil: bulk-replace call sites to point to new module This might conflict with other patches floating around, sorry.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Mar 2018 21:56:20 +0900
parents 39304dd63589
children 3ed344546d9e
comparison
equal deleted inserted replaced
37083:f99d64e8a4e4 37084:f0b6fbea00cf
18 attr, 18 attr,
19 ) 19 )
20 from . import ( 20 from . import (
21 error, 21 error,
22 util, 22 util,
23 )
24 from .utils import (
25 stringutil,
23 ) 26 )
24 27
25 FRAME_HEADER_SIZE = 6 28 FRAME_HEADER_SIZE = 6
26 DEFAULT_MAX_FRAME_SIZE = 32768 29 DEFAULT_MAX_FRAME_SIZE = 32768
27 30
162 if flag in validflags: 165 if flag in validflags:
163 finalflags |= validflags[flag] 166 finalflags |= validflags[flag]
164 else: 167 else:
165 finalflags |= int(flag) 168 finalflags |= int(flag)
166 169
167 payload = util.unescapestr(payload) 170 payload = stringutil.unescapestr(payload)
168 171
169 return makeframe(requestid=requestid, typeid=frametype, 172 return makeframe(requestid=requestid, typeid=frametype,
170 flags=finalflags, payload=payload) 173 flags=finalflags, payload=payload)
171 174
172 def parseheader(data): 175 def parseheader(data):