##// END OF EJS Templates
py3: ensure standard exceptions use `str` type strings in windows.py...
Matt Harbison -
r39919:2209e72f default
parent child Browse files
Show More
@@ -164,8 +164,8 b" def posixfile(name, mode='r', buffering="
164 return fp
164 return fp
165 except WindowsError as err:
165 except WindowsError as err:
166 # convert to a friendlier exception
166 # convert to a friendlier exception
167 raise IOError(err.errno, '%s: %s' % (
167 raise IOError(err.errno, r'%s: %s' % (
168 name, encoding.strtolocal(err.strerror)))
168 encoding.strfromlocal(name), err.strerror))
169
169
170 # may be wrapped by win32mbcs extension
170 # may be wrapped by win32mbcs extension
171 listdir = osutil.listdir
171 listdir = osutil.listdir
@@ -201,7 +201,7 b' class winstdout(object):'
201 if inst.errno != 0 and not win32.lasterrorwaspipeerror(inst):
201 if inst.errno != 0 and not win32.lasterrorwaspipeerror(inst):
202 raise
202 raise
203 self.close()
203 self.close()
204 raise IOError(errno.EPIPE, 'Broken pipe')
204 raise IOError(errno.EPIPE, r'Broken pipe')
205
205
206 def flush(self):
206 def flush(self):
207 try:
207 try:
@@ -209,7 +209,7 b' class winstdout(object):'
209 except IOError as inst:
209 except IOError as inst:
210 if not win32.lasterrorwaspipeerror(inst):
210 if not win32.lasterrorwaspipeerror(inst):
211 raise
211 raise
212 raise IOError(errno.EPIPE, 'Broken pipe')
212 raise IOError(errno.EPIPE, r'Broken pipe')
213
213
214 def _is_win_9x():
214 def _is_win_9x():
215 '''return true if run on windows 95, 98 or me.'''
215 '''return true if run on windows 95, 98 or me.'''
@@ -616,4 +616,4 b' def readpipe(pipe):'
616 return ''.join(chunks)
616 return ''.join(chunks)
617
617
618 def bindunixsocket(sock, path):
618 def bindunixsocket(sock, path):
619 raise NotImplementedError('unsupported platform')
619 raise NotImplementedError(r'unsupported platform')
General Comments 0
You need to be logged in to leave comments. Login now