Merge pull request gtsystem#4 from gtsystem/range_required

gtsystem · web-flow · commit a0be1dd3157a · 2021-03-22T12:08:27.000+01:00
Explicit failure in case range request is not supported
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ python:
   - "3.8"
 
 # command to install dependencies
-install: "python setup.py install"
+install:
+  - pip install requests-mock
+  - python setup.py install
 # command to run tests
 script: py.test
diff --git a/bin/remotezip b/bin/remotezip
@@ -6,7 +6,7 @@ from remotezip import RemoteZip
 
 
 def list_files(url, filenames):
-    with RemoteZip(url) as zip:
+    with RemoteZip(url, headers={'User-Agent': 'remotezip'}) as zip:
         if len(filenames) == 0:
             filenames = zip.namelist()
         data = [('Length', 'DateTime', 'Name')]
diff --git a/remotezip.py b/remotezip.py
@@ -5,12 +5,18 @@
 
 __all__ = ['RemoteIOError', 'RemoteZip']
 
+class RemoteZipError(Exception):
+    pass
+
+class OutOfBound(RemoteZipError):
+    pass
+
 
-class OutOfBound(Exception):
+class RemoteIOError(RemoteZipError):
     pass
 
 
-class RemoteIOError(Exception):
+class RangeNotSupported(RemoteZipError):
     pass
 
 
@@ -160,6 +166,8 @@ def request(url, range_header, kwargs):
         headers['Range'] = range_header
         res = requests.get(url, stream=True, **kwargs)
         res.raise_for_status()
+        if 'Content-Range' not in res.headers:
+            raise RangeNotSupported("The server doesn't support range requests")
         return res.raw, res.headers
 
     def fetch_fun(self, data_range, stream=False):
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='remotezip',
-    version='0.9.2',
+    version='0.9.3',
     author='Giuseppe Tribulato',
     author_email='gtsystem@gmail.com',
     py_modules=['remotezip'],
diff --git a/test_remotezip.py b/test_remotezip.py
@@ -5,6 +5,8 @@
 import shutil
 import io
 
+import requests_mock
+
 import remotezip as rz
 
 
@@ -41,6 +43,10 @@ def fetch_fun(self, data_range, stream=False):
 
 
 class TestPartialBuffer(unittest.TestCase):
+    def setUp(self):
+        if not hasattr(self, 'assertRaisesRegex'):
+            self.assertRaisesRegex = self.assertRaisesRegexp
+
     def verify(self, stream):
         pb = rz.PartialBuffer(io.BytesIO(b'aaaabbcccdd'), 10, 11, stream=stream)
         self.assertEqual(pb.position, 10)
@@ -89,7 +95,7 @@ def test_stream_forward_seek(self):
         self.assertEqual(pb.seek(2, 1), 17)
         self.assertEqual(pb.read(), b'ccdd')
 
-        with self.assertRaisesRegexp(rz.OutOfBound, "Negative seek not supported"):
+        with self.assertRaisesRegex(rz.OutOfBound, "Negative seek not supported"):
             pb.seek(12, 0)
         self.assertEqual(pb.position, 12)
 
@@ -251,6 +257,12 @@ def test_make_header(self):
         header = LocalRemoteZip.make_header(-123, None)
         self.assertEqual(header, 'bytes=-123')
 
+    def test_range_not_supported(self):
+        with requests_mock.Mocker() as m:
+            m.get("http://test.com/file.zip")
+            with self.assertRaises(rz.RangeNotSupported):
+                rz.RemoteZip("http://test.com/file.zip")
+
     # TODO: test get_position2size
 
 if __name__ == '__main__':
