Merge pull request #4822 from PrimozGodec/fix-extension

UrlReader: fix issue with double extensions

Orange/data/io.py

@@ -1,7 +1,6 @@
 import contextlib
 import csv
 import locale
-import os
 import pickle
 import re
 import sys
@@ -16,6 +15,7 @@
 from tempfile import NamedTemporaryFile
 from urllib.parse import urlparse, urlsplit, urlunsplit, unquote as urlunquote
 from urllib.request import urlopen, Request
+from pathlib import Path
 
 import numpy as np
 
@@ -400,7 +400,8 @@ def read(self):
         self.filename = self._trim(self._resolve_redirects(self.filename))
         with contextlib.closing(self.urlopen(self.filename)) as response:
             name = self._suggest_filename(response.headers['content-disposition'])
-            extension = os.path.splitext(name)[1]  # get only file extension
+            # using Path since splitext does not extract more extensions
+            extension = ''.join(Path(name).suffixes)  # get only file extension
             with NamedTemporaryFile(suffix=extension, delete=False) as f:
                 f.write(response.read())
                 # delete=False is a workaround for https://bugs.python.org/issue14243

Orange/tests/test_url_reader.py

@@ -0,0 +1,19 @@
+import unittest
+
+from Orange.data.io import UrlReader
+
+
+class TestUrlReader(unittest.TestCase):
+    def test_basic_file(self):
+        data = UrlReader("https://datasets.biolab.si/core/titanic.tab").read()
+        self.assertEqual(2201, len(data))
+
+        data = UrlReader("https://datasets.biolab.si/core/grades.xlsx").read()
+        self.assertEqual(16, len(data))
+
+    def test_zipped(self):
+        """ Test zipped files with two extensions"""
+        data = UrlReader(
+            "http://datasets.orange.biolab.si/core/philadelphia-crime.csv.xz"
+        ).read()
+        self.assertEqual(9666, len(data))