##// END OF EJS Templates
doctest: bulk-replace string literals with b'' for Python 3...
doctest: bulk-replace string literals with b'' for Python 3 Our code transformer can't rewrite string literals in docstrings, and I don't want to make the transformer more complex.

File last commit:

r34133:0fa78132 default
r34133:0fa78132 default
Show More
byterange.py
472 lines | 16.3 KiB | text/x-python | PythonLexer
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
Martin Geisler
Remove FSF mailing address from GPL headers...
r15782 # License along with this library; if not, see
# <http://www.gnu.org/licenses/>.
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
# This file is part of urlgrabber, a high-level cross-protocol url-grabber
# Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
# $Id: byterange.py,v 1.9 2005/02/14 21:55:07 mstenner Exp $
Gregory Szorc
byterange: use absolute_import...
r27504 from __future__ import absolute_import
import email
import ftplib
import mimetypes
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 import os
Gregory Szorc
byterange: use absolute_import...
r27504 import re
import socket
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 import stat
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883
from . import (
util,
)
urlerr = util.urlerr
urlreq = util.urlreq
Gregory Szorc
byterange: use absolute_import...
r27504
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 addclosehook = urlreq.addclosehook
addinfourl = urlreq.addinfourl
splitattr = urlreq.splitattr
splitpasswd = urlreq.splitpasswd
splitport = urlreq.splitport
splituser = urlreq.splituser
unquote = urlreq.unquote
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
class RangeError(IOError):
"""Error raised when an unsatisfiable range is requested."""
pass
mpm@selenic.com
More whitespace cleanups...
r575
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 class HTTPRangeHandler(urlreq.basehandler):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """Handler that enables HTTP Range headers.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 This was extremely simple. The Range header is a HTTP feature to
mpm@selenic.com
More whitespace cleanups...
r575 begin with so all this class does is tell urllib2 that the
Mads Kiilerich
fix trivial spelling errors
r17424 "206 Partial Content" response from the HTTP server is what we
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 expected.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 Example:
import urllib2
import byterange
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 range_handler = range.HTTPRangeHandler()
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 opener = urlreq.buildopener(range_handler)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # install it
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 urlreq.installopener(opener)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # create Request and set Range header
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 req = urlreq.request('http://www.python.org/')
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 req.header['Range'] = 'bytes=30-50'
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 f = urlreq.urlopen(req)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def http_error_206(self, req, fp, code, msg, hdrs):
# 206 Partial Content Response
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 r = urlreq.addinfourl(fp, hdrs, req.get_full_url())
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 r.code = code
r.msg = msg
return r
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def http_error_416(self, req, fp, code, msg, hdrs):
# HTTP's Range Not Satisfiable error
raise RangeError('Requested Range Not Satisfiable')
Thomas Arendsen Hein
classes: fix class style problems found by b071cd58af50...
r14764 class RangeableFileObject(object):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """File object wrapper to enable raw range handling.
timeless@mozdev.org
spelling: primarily
r17507 This was implemented primarily for handling range
mpm@selenic.com
More whitespace cleanups...
r575 specifications for file:// urls. This object effectively makes
a file object look like it consists only of a range of bytes in
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 the stream.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 Examples:
mpm@selenic.com
More whitespace cleanups...
r575 # expose 10 bytes, starting at byte position 20, from
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # /etc/aliases.
Yuya Nishihara
doctest: bulk-replace string literals with b'' for Python 3...
r34133 >>> fo = RangeableFileObject(file(b'/etc/passwd', b'r'), (20,30))
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # seek seeks within the range (to position 23 in this case)
>>> fo.seek(3)
# tell tells where your at _within the range_ (position 3 in
# this case)
>>> fo.tell()
# read EOFs if an attempt is made to read past the last
# byte in the range. the following will return only 7 bytes.
>>> fo.read(30)
"""
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def __init__(self, fo, rangetup):
"""Create a RangeableFileObject.
mpm@selenic.com
More whitespace cleanups...
r575 fo -- a file like object. only the read() method need be
supported but supporting an optimized seek() is
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 preferable.
rangetup -- a (firstbyte,lastbyte) tuple specifying the range
to work over.
The file object provided is assumed to be at byte offset 0.
"""
self.fo = fo
(self.firstbyte, self.lastbyte) = range_tuple_normalize(rangetup)
self.realpos = 0
self._do_seek(self.firstbyte)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def __getattr__(self, name):
"""This effectively allows us to wrap at the instance level.
Any attribute not found in _this_ object will be searched for
in self.fo. This includes methods."""
Augie Fackler
byterange: replace uses of hasattr with getattr
r14947 return getattr(self.fo, name)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def tell(self):
"""Return the position within the range.
mpm@selenic.com
More whitespace cleanups...
r575 This is different from fo.seek in that position 0 is the
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 first byte position of the range tuple. For example, if
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)
mpm@selenic.com
More whitespace cleanups...
r575
Thomas Arendsen Hein
white space and line break cleanups
r3673 def seek(self, offset, whence=0):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """Seek within the byte range.
Positioning is identical to that described under tell().
"""
assert whence in (0, 1, 2)
if whence == 0: # absolute seek
realoffset = self.firstbyte + offset
elif whence == 1: # relative seek
realoffset = self.realpos + offset
elif whence == 2: # absolute from end of file
# XXX: are we raising the right Error here?
raise IOError('seek from end of file not supported.')
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # do not allow seek past lastbyte in range
if self.lastbyte and (realoffset >= self.lastbyte):
realoffset = self.lastbyte
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 self._do_seek(realoffset - self.realpos)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def read(self, size=-1):
"""Read within the range.
This method will limit the size read based on the range.
"""
size = self._calc_read_size(size)
rslt = self.fo.read(size)
self.realpos += len(rslt)
return rslt
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def readline(self, size=-1):
"""Read lines within the range.
This method will limit the size read based on the range.
"""
size = self._calc_read_size(size)
rslt = self.fo.readline(size)
self.realpos += len(rslt)
return rslt
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def _calc_read_size(self, size):
"""Handles calculating the amount of data to read based on
the range.
"""
if self.lastbyte:
if size > -1:
if ((self.realpos + size) >= self.lastbyte):
size = (self.lastbyte - self.realpos)
else:
size = (self.lastbyte - self.realpos)
return size
mpm@selenic.com
More whitespace cleanups...
r575
Thomas Arendsen Hein
white space and line break cleanups
r3673 def _do_seek(self, offset):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """Seek based on whether wrapped object supports seek().
offset is relative to the current position (self.realpos).
"""
assert offset >= 0
Augie Fackler
byterange: replace uses of hasattr with getattr
r14947 seek = getattr(self.fo, 'seek', self._poor_mans_seek)
seek(self.realpos + offset)
Thomas Arendsen Hein
white space and line break cleanups
r3673 self.realpos += offset
mpm@selenic.com
More whitespace cleanups...
r575
Thomas Arendsen Hein
white space and line break cleanups
r3673 def _poor_mans_seek(self, offset):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """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
file object.
mpm@selenic.com
More whitespace cleanups...
r575 raise RangeError if we encounter EOF before reaching the
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 specified offset.
"""
pos = 0
bufsize = 1024
while pos < offset:
if (pos + bufsize) > offset:
bufsize = offset - pos
buf = self.fo.read(bufsize)
if len(buf) != bufsize:
raise RangeError('Requested Range Not Satisfiable')
Thomas Arendsen Hein
white space and line break cleanups
r3673 pos += bufsize
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 class FileRangeHandler(urlreq.filehandler):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """FileHandler subclass that adds Range support.
This class handles Range headers exactly like an HTTP
server would.
"""
def open_local_file(self, req):
host = req.get_host()
file = req.get_selector()
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 localfile = urlreq.url2pathname(file)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 stats = os.stat(localfile)
size = stats[stat.ST_SIZE]
Martin Geisler
byterange: fix import error...
r8378 modified = email.Utils.formatdate(stats[stat.ST_MTIME])
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 mtype = mimetypes.guess_type(file)[0]
if host:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 host, port = urlreq.splitport(host)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 if port or socket.gethostbyname(host) not in self.get_names():
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 raise urlerr.urlerror('file not on local host')
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 fo = open(localfile,'rb')
Thomas Arendsen Hein
white space and line break cleanups
r3673 brange = req.headers.get('Range', None)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 brange = range_header_to_tuple(brange)
assert brange != ()
if brange:
Thomas Arendsen Hein
white space and line break cleanups
r3673 (fb, lb) = brange
if lb == '':
lb = size
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 if fb < 0 or fb > size or lb > size:
raise RangeError('Requested Range Not Satisfiable')
size = (lb - fb)
Thomas Arendsen Hein
white space and line break cleanups
r3673 fo = RangeableFileObject(fo, (fb, lb))
Alejandro Santos
compat: use email in favor of mimetools
r9034 headers = email.message_from_string(
Dirkjan Ochtman
send conservatively capitalized HTTP headers
r5930 'Content-Type: %s\nContent-Length: %d\nLast-Modified: %s\n' %
Alejandro Santos
compat: use email in favor of mimetools
r9034 (mtype or 'text/plain', size, modified))
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 return urlreq.addinfourl(fo, headers, 'file:'+file)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
mpm@selenic.com
More whitespace cleanups...
r575 # FTP Range Support
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # Unfortunately, a large amount of base FTP code had to be copied
# from urllib and urllib2 in order to insert the FTP REST command.
mpm@selenic.com
More whitespace cleanups...
r575 # Code modifications for range support have been commented as
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # follows:
# -- range support modifications start/end here
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 class FTPRangeHandler(urlreq.ftphandler):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def ftp_open(self, req):
host = req.get_host()
if not host:
Peter Ruibal
use Exception(args)-style raising consistently (py3k compatibility)
r7008 raise IOError('ftp error', 'no host given')
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 host, port = splitport(host)
if port is None:
port = ftplib.FTP_PORT
Benoit Boissinot
byterange: backport fix from upstream
r9695 else:
port = int(port)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
# username/password handling
user, host = splituser(host)
if user:
user, passwd = splitpasswd(user)
else:
passwd = None
host = unquote(host)
user = unquote(user or '')
passwd = unquote(passwd or '')
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 try:
host = socket.gethostbyname(host)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except socket.error as msg:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 raise urlerr.urlerror(msg)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 path, attrs = splitattr(req.get_selector())
dirs = path.split('/')
dirs = map(unquote, dirs)
dirs, file = dirs[:-1], dirs[-1]
if dirs and not dirs[0]:
dirs = dirs[1:]
try:
fw = self.connect_ftp(user, passwd, host, port, dirs)
Jordi Gutiérrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if file:
type = 'I'
else:
type = 'D'
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 for attr in attrs:
attr, value = splitattr(attr)
if attr.lower() == 'type' and \
value in ('a', 'A', 'i', 'I', 'd', 'D'):
type = value.upper()
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # -- range support modifications start here
rest = None
Thomas Arendsen Hein
white space and line break cleanups
r3673 range_tup = range_header_to_tuple(req.headers.get('Range', None))
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 assert range_tup != ()
if range_tup:
Thomas Arendsen Hein
white space and line break cleanups
r3673 (fb, lb) = range_tup
if fb > 0:
rest = fb
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # -- range support modifications end here
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 fp, retrlen = fw.retrfile(file, type, rest)
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # -- range support modifications start here
if range_tup:
Thomas Arendsen Hein
white space and line break cleanups
r3673 (fb, lb) = range_tup
mpm@selenic.com
More whitespace cleanups...
r575 if lb == '':
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 if retrlen is None or retrlen == 0:
Matt Mackall
many, many trivial check-code fixups
r10282 raise RangeError('Requested Range Not Satisfiable due'
' to unobtainable file length.')
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 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
Thomas Arendsen Hein
white space and line break cleanups
r3673 fp = RangeableFileObject(fp, (0, retrlen))
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # -- range support modifications end here
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 headers = ""
mtype = mimetypes.guess_type(req.get_full_url())[0]
if mtype:
headers += "Content-Type: %s\n" % mtype
if retrlen is not None and retrlen >= 0:
headers += "Content-Length: %d\n" % retrlen
Alejandro Santos
compat: use email in favor of mimetools
r9034 headers = email.message_from_string(headers)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 return addinfourl(fp, headers, req.get_full_url())
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except ftplib.all_errors as msg:
Augie Fackler
byterange: remove old two-arg raise trick...
r18586 raise IOError('ftp error', msg)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
def connect_ftp(self, user, passwd, host, port, dirs):
fw = ftpwrapper(user, passwd, host, port, dirs)
return fw
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 class ftpwrapper(urlreq.ftpwrapper):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # range support note:
# 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()
Thomas Arendsen Hein
white space and line break cleanups
r3673 if type in ('d', 'D'):
cmd = 'TYPE A'
isdir = 1
else:
cmd = 'TYPE ' + type
isdir = 0
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 try:
self.ftp.voidcmd(cmd)
except ftplib.all_errors:
self.init()
self.ftp.voidcmd(cmd)
conn = None
if file and not isdir:
# Use nlst to see if the file exists at all
try:
self.ftp.nlst(file)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except ftplib.error_perm as reason:
Augie Fackler
byterange: remove old two-arg raise trick...
r18586 raise IOError('ftp error', reason)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # Restore the transfer mode!
self.ftp.voidcmd(cmd)
# Try to retrieve as a file
try:
cmd = 'RETR ' + file
conn = self.ftp.ntransfercmd(cmd, rest)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except ftplib.error_perm as reason:
chad.netzer@gmail.com
Make consistent use of str.startswith() in conditionals....
r674 if str(reason).startswith('501'):
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # workaround for REST not supported error
fp, retrlen = self.retrfile(file, type)
fp = RangeableFileObject(fp, (rest,''))
return (fp, retrlen)
chad.netzer@gmail.com
Make consistent use of str.startswith() in conditionals....
r674 elif not str(reason).startswith('550'):
Augie Fackler
byterange: remove old two-arg raise trick...
r18586 raise IOError('ftp error', reason)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 if not conn:
# Set transfer mode to ASCII!
self.ftp.voidcmd('TYPE A')
# Try a directory listing
Thomas Arendsen Hein
white space and line break cleanups
r3673 if file:
cmd = 'LIST ' + file
else:
cmd = 'LIST'
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 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])
####################################################################
# Range Tuple Functions
# XXX: These range tuple functions might go better in a class.
_rangere = None
def range_header_to_tuple(range_header):
"""Get a (firstbyte,lastbyte) tuple from a Range header value.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 Range headers have the form "bytes=<firstbyte>-<lastbyte>". This
function pulls the firstbyte and lastbyte values and returns
a (firstbyte,lastbyte) tuple. If lastbyte is not specified in
the header value, it is returned as an empty string in the
tuple.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 Return None if range_header is None
mpm@selenic.com
More whitespace cleanups...
r575 Return () if range_header does not conform to the range spec
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 pattern.
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """
global _rangere
Thomas Arendsen Hein
white space and line break cleanups
r3673 if range_header is None:
return None
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 if _rangere is None:
_rangere = re.compile(r'^bytes=(\d{1,})-(\d*)')
match = _rangere.match(range_header)
mpm@selenic.com
More whitespace cleanups...
r575 if match:
Thomas Arendsen Hein
white space and line break cleanups
r3673 tup = range_tuple_normalize(match.group(1, 2))
mpm@selenic.com
More whitespace cleanups...
r575 if tup and tup[1]:
Thomas Arendsen Hein
white space and line break cleanups
r3673 tup = (tup[0], tup[1]+1)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 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.
"""
Thomas Arendsen Hein
white space and line break cleanups
r3673 if range_tup is None:
return None
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 range_tup = range_tuple_normalize(range_tup)
if range_tup:
mpm@selenic.com
More whitespace cleanups...
r575 if range_tup[1]:
Thomas Arendsen Hein
white space and line break cleanups
r3673 range_tup = (range_tup[0], range_tup[1] - 1)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 return 'bytes=%s-%s' % range_tup
mpm@selenic.com
More whitespace cleanups...
r575
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 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
mpm@selenic.com
More whitespace cleanups...
r575 and whose second element will be '' (meaning: the last byte) or
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 an int. Finally, return None if the normalized tuple == (0,'')
timeless@mozdev.org
spelling: equivalent
r17489 as that is equivalent to retrieving the entire file.
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 """
Thomas Arendsen Hein
white space and line break cleanups
r3673 if range_tup is None:
return None
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # handle first byte
fb = range_tup[0]
Thomas Arendsen Hein
white space and line break cleanups
r3673 if fb in (None, ''):
fb = 0
else:
fb = int(fb)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # handle last byte
Thomas Arendsen Hein
white space and line break cleanups
r3673 try:
lb = range_tup[1]
except IndexError:
lb = ''
mpm@selenic.com
More whitespace cleanups...
r575 else:
Thomas Arendsen Hein
white space and line break cleanups
r3673 if lb is None:
lb = ''
elif lb != '':
lb = int(lb)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # check if range is over the entire file
Thomas Arendsen Hein
white space and line break cleanups
r3673 if (fb, lb) == (0, ''):
return None
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # check that the range is valid
Thomas Arendsen Hein
white space and line break cleanups
r3673 if lb < fb:
raise RangeError('Invalid byte range: %s-%s' % (fb, lb))
return (fb, lb)