mercurial-crew-with-dirclash: comparison mercurial/byterange.py

equal deleted inserted replaced

-:e8730b5b8a32
+:eb0b4a2d70a9
 this object was created with a range tuple of (500,899),
 tell() will return 0 when at byte position 500 of the file.
 """
 return (self.realpos - self.firstbyte)
-def seek(self,offset,whence=0):
+def seek(self, offset, whence=0):
 """Seek within the byte range.
 Positioning is identical to that described under tell().
 """
 assert whence in (0, 1, 2)
 if whence == 0:   # absolute seek
 size = (self.lastbyte - self.realpos)
 else:
 size = (self.lastbyte - self.realpos)
 return size
-def _do_seek(self,offset):
+def _do_seek(self, offset):
 """Seek based on whether wrapped object supports seek().
 offset is relative to the current position (self.realpos).
 """
 assert offset >= 0
 if not hasattr(self.fo, 'seek'):
 self._poor_mans_seek(offset)
 else:
 self.fo.seek(self.realpos + offset)
-self.realpos+= offset
+self.realpos += offset
-def _poor_mans_seek(self,offset):
+def _poor_mans_seek(self, offset):
 """Seek by calling the wrapped file objects read() method.
 This is used for file like objects that do not have native
 seek support. The wrapped objects read() method is called
 to manually seek to the desired position.
 offset -- read this number of bytes from the wrapped
 if (pos + bufsize) > offset:
 bufsize = offset - pos
 buf = self.fo.read(bufsize)
 if len(buf) != bufsize:
 raise RangeError('Requested Range Not Satisfiable')
-pos+= bufsize
+pos += bufsize
 class FileRangeHandler(urllib2.FileHandler):
 """FileHandler subclass that adds Range support.
 This class handles Range headers exactly like an HTTP
 server would.
 if host:
 host, port = urllib.splitport(host)
 if port or socket.gethostbyname(host) not in self.get_names():
 raise urllib2.URLError('file not on local host')
 fo = open(localfile,'rb')
-brange = req.headers.get('Range',None)
+brange = req.headers.get('Range', None)
 brange = range_header_to_tuple(brange)
 assert brange != ()
 if brange:
-(fb,lb) = brange
+(fb, lb) = brange
-if lb == '': lb = size
+if lb == '':
+lb = size
 if fb < 0 or fb > size or lb > size:
 raise RangeError('Requested Range Not Satisfiable')
 size = (lb - fb)
-fo = RangeableFileObject(fo, (fb,lb))
+fo = RangeableFileObject(fo, (fb, lb))
 headers = mimetools.Message(StringIO(
 'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' %
 (mtype or 'text/plain', size, modified)))
 return urllib.addinfourl(fo, headers, 'file:'+file)
 value in ('a', 'A', 'i', 'I', 'd', 'D'):
 type = value.upper()
 # -- range support modifications start here
 rest = None
-range_tup = range_header_to_tuple(req.headers.get('Range',None))
+range_tup = range_header_to_tuple(req.headers.get('Range', None))
 assert range_tup != ()
 if range_tup:
-(fb,lb) = range_tup
+(fb, lb) = range_tup
-if fb > 0: rest = fb
+if fb > 0:
+rest = fb
 # -- range support modifications end here
 fp, retrlen = fw.retrfile(file, type, rest)
 # -- range support modifications start here
 if range_tup:
-(fb,lb) = range_tup
+(fb, lb) = range_tup
 if lb == '':
 if retrlen is None or retrlen == 0:
 raise RangeError('Requested Range Not Satisfiable due to unobtainable file length.')
 lb = retrlen
 retrlen = lb - fb
 if retrlen < 0:
 # beginning of range is larger than file
 raise RangeError('Requested Range Not Satisfiable')
 else:
 retrlen = lb - fb
-fp = RangeableFileObject(fp, (0,retrlen))
+fp = RangeableFileObject(fp, (0, retrlen))
 # -- range support modifications end here
 headers = ""
 mtype = mimetypes.guess_type(req.get_full_url())[0]
 if mtype:
 # this ftpwrapper code is copied directly from
 # urllib. The only enhancement is to add the rest
 # argument and pass it on to ftp.ntransfercmd
 def retrfile(self, file, type, rest=None):
 self.endtransfer()
-if type in ('d', 'D'): cmd = 'TYPE A'; isdir = 1
+if type in ('d', 'D'):
-else: cmd = 'TYPE ' + type; isdir = 0
+cmd = 'TYPE A'
+isdir = 1
+else:
+cmd = 'TYPE ' + type
+isdir = 0
 try:
 self.ftp.voidcmd(cmd)
 except ftplib.all_errors:
 self.init()
 self.ftp.voidcmd(cmd)
 raise IOError, ('ftp error', reason), sys.exc_info()[2]
 if not conn:
 # Set transfer mode to ASCII!
 self.ftp.voidcmd('TYPE A')
 # Try a directory listing
-if file: cmd = 'LIST ' + file
+if file:
-else: cmd = 'LIST'
+cmd = 'LIST ' + file
+else:
+cmd = 'LIST'
 conn = self.ftp.ntransfercmd(cmd)
 self.busy = 1
 # Pass back both a suitably decorated object and a retrieval length
 return (addclosehook(conn[0].makefile('rb'),
 self.endtransfer), conn[1])
 Return () if range_header does not conform to the range spec
 pattern.
 """
 global _rangere
-if range_header is None: return None
+if range_header is None:
+return None
 if _rangere is None:
 import re
 _rangere = re.compile(r'^bytes=(\d{1,})-(\d*)')
 match = _rangere.match(range_header)
 if match:
-tup = range_tuple_normalize(match.group(1,2))
+tup = range_tuple_normalize(match.group(1, 2))
 if tup and tup[1]:
-tup = (tup[0],tup[1]+1)
+tup = (tup[0], tup[1]+1)
 return tup
 return ()
 def range_tuple_to_header(range_tup):
 """Convert a range tuple to a Range header value.
 Return a string of the form "bytes=<firstbyte>-<lastbyte>" or None
 if no range is needed.
 """
-if range_tup is None: return None
+if range_tup is None:
+return None
 range_tup = range_tuple_normalize(range_tup)
 if range_tup:
 if range_tup[1]:
-range_tup = (range_tup[0],range_tup[1] - 1)
+range_tup = (range_tup[0], range_tup[1] - 1)
 return 'bytes=%s-%s' % range_tup
 def range_tuple_normalize(range_tup):
 """Normalize a (first_byte,last_byte) range tuple.
 Return a tuple whose first element is guaranteed to be an int
 and whose second element will be '' (meaning: the last byte) or
 an int. Finally, return None if the normalized tuple == (0,'')
 as that is equivelant to retrieving the entire file.
 """
-if range_tup is None: return None
+if range_tup is None:
+return None
 # handle first byte
 fb = range_tup[0]
-if fb in (None,''): fb = 0
+if fb in (None, ''):
-else: fb = int(fb)
+fb = 0
+else:
+fb = int(fb)
 # handle last byte
-try: lb = range_tup[1]
+try:
-except IndexError: lb = ''
+lb = range_tup[1]
+except IndexError:
+lb = ''
 else:
-if lb is None: lb = ''
+if lb is None:
-elif lb != '': lb = int(lb)
+lb = ''
+elif lb != '':
+lb = int(lb)
 # check if range is over the entire file
-if (fb,lb) == (0,''): return None
+if (fb, lb) == (0, ''):
+return None
 # check that the range is valid
-if lb < fb: raise RangeError('Invalid byte range: %s-%s' % (fb,lb))
+if lb < fb:
-return (fb,lb)
+raise RangeError('Invalid byte range: %s-%s' % (fb, lb))
+return (fb, lb)

changeset 3673	eb0b4a2d70a9
parent 674	6513ba7d858a