Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Orange/data/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,14 @@ def __init__(self, filename):
filename = filename.strip()
if not urlparse(filename).scheme:
filename = 'http://' + filename
filename = quote(filename, safe="/:")

# check ? avoid quote redundantly on URL like http://filename.txt?a=1&b=2.
mark = filename.find('?')
if mark >= 0:
filename = quote(filename[:mark], safe="/:") + filename[mark:]
else:
filename = quote(filename, safe="/:")

super().__init__(filename)

@staticmethod
Expand Down
9 changes: 9 additions & 0 deletions Orange/tests/test_url_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ def test_special_characters(self):
"vestnik-clanki/detektiranje-utrdb-v-šahu-.txt"
self.assertRaises(OSError, UrlReader(path).read)

def test_base_url_with_parameters(self):
data = UrlReader("https://datasets.biolab.si/core/grades.xlsx?a=1&b=2").read()
self.assertEqual(16, len(data))

def test_special_characters_with_parameters(self):
path = "http://file.biolab.si/text-semantics/data/elektrotehniski-" \
"vestnik-clanki/detektiranje-utrdb-v-šahu-.txt?a=1&b=2"
self.assertRaises(OSError, UrlReader(path).read)


if __name__ == "__main__":
unittest.main()