Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OWCSVImport: Get ready for OWFile merge #5077

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft

OWCSVImport: Get ready for OWFile merge #5077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a02eb7b
owcsvimport: Add some comments
irgolic Nov 6, 2020
239c9ec
owcsvimport: Add domain editor
irgolic Nov 6, 2020
bccefe2
owcsvimport: Automatically browse relative
irgolic Jan 5, 2021
2ea134f
owcsvimport: Make info box as small as possible
irgolic Aug 2, 2021
4d91b25
owcsvimport: Add table preview to mainArea, reorg controlArea
irgolic Jan 6, 2021
58669f4
owcsvimport: Add reset/autocommit to domain editor
irgolic Aug 2, 2021
d900672
textimport: Show header/skip row options in dataview
irgolic Jan 6, 2021
ca12e6d
textimport: Select column on horizontal header right-click
irgolic Jan 6, 2021
4eb255f
test_owcsvimport: Test numeric->text warning
irgolic Jan 7, 2021
c7ebd84
owcsvimport: Use contexts
irgolic Aug 4, 2021
1c3dbcc
owcsvimport: Warn on unsafe cast
irgolic Aug 4, 2021
202d8c7
domaineditor: Fix combobox hack
irgolic Aug 4, 2021
9ac47c6
test_owcsvimport: Fixup tests
irgolic Aug 5, 2021
cd577d9
pylint
irgolic Aug 5, 2021
a9e23ba
owcsvimport: Use more delimiters
irgolic Aug 6, 2021
28c688a
owcsvimport: Select file filter to use registered loader
irgolic Aug 6, 2021
63e736d
io: Wrap redirect resolve in try/except
irgolic Aug 6, 2021
53d2c23
io: Go for https over http
irgolic Aug 6, 2021
0b5d127
io: Fix google spreadsheet sheet id bug
irgolic Aug 6, 2021
dccf88c
owcsvimport: Support spreadsheets and url
irgolic Aug 6, 2021
3a54a22
owcsvimport: If sniff orange types or flags, use reader
irgolic Aug 6, 2021
797ab7b
owcsvimport: Clear on invalidate
irgolic Aug 6, 2021
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
12 changes: 8 additions & 4 deletions Orange/data/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

from os import path, remove
from tempfile import NamedTemporaryFile
from urllib.error import HTTPError
from urllib.parse import urlparse, urlsplit, urlunsplit, \
unquote as urlunquote, quote
from urllib.request import urlopen, Request
Expand Down Expand Up @@ -405,7 +406,7 @@ class UrlReader(FileFormat):
def __init__(self, filename):
filename = filename.strip()
if not urlparse(filename).scheme:
filename = 'http://' + filename
filename = 'https://' + filename
filename = quote(filename, safe="/:")
super().__init__(filename)

Expand Down Expand Up @@ -437,8 +438,11 @@ def read(self):

def _resolve_redirects(self, url):
# Resolve (potential) redirects to a final URL
with contextlib.closing(self.urlopen(url)) as response:
return response.url
try:
with contextlib.closing(self.urlopen(url)) as response:
return response.url
except HTTPError:
return url

@classmethod
def _trim(cls, url):
Expand All @@ -460,7 +464,7 @@ def _trim_googlesheet(url):
match = re.match(r'(?:https?://)?(?:www\.)?'
r'docs\.google\.com/spreadsheets/d/'
r'(?P<workbook_id>[-\w_]+)'
r'(?:/.*?gid=(?P<sheet_id>\d+).*|.*)?',
r'(?:/.*?gid(=|%3D)(?P<sheet_id>\d+).*|.*)?',
url, re.IGNORECASE)
try:
workbook, sheet = match.group('workbook_id'), match.group('sheet_id')
Expand Down
Loading