Skip to content

TST: win32 paths cannot be turned into URLs by prefixing them with "file://" #4580

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

Closed
wants to merge 3 commits into from
Closed

TST: win32 paths cannot be turned into URLs by prefixing them with "file://" #4580

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d64a047
win32 paths cannot be turned into URLs by prefixing them with "file://"
mindw Aug 16, 2013
ebc23c8
make fix less patchy
mindw Aug 17, 2013
3236647
make path_to_url python3 friendly
mindw Aug 23, 2013
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
2 changes: 2 additions & 0 deletions doc/source/release.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ pandas 0.13

**Bug Fixes**

- Fixed html tests on win32. (:issue:`4580`)

pandas 0.12
===========

Expand Down
17 changes: 17 additions & 0 deletions pandas/io/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import urlparse
import urllib2
import urllib
import zipfile
from contextlib import contextmanager, closing
from StringIO import StringIO
Expand Down Expand Up @@ -91,6 +92,22 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None):
return filepath_or_buffer, None


def path_to_url(path):
"""
converts an absolute native path to a FILE URL.

Parameters
----------
path : a path in native format

Returns
-------
a valid FILE URL
"""
return urlparse.urljoin(
'file:', urllib.pathname2url(path))


# ----------------------
# Prevent double closing
if py3compat.PY3:
Expand Down
12 changes: 8 additions & 4 deletions pandas/io/tests/test_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@

from pandas.io.html import read_html
from pandas.io.common import urlopen
from pandas.io.common import path_to_url
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please combine these imports


from pandas import DataFrame, MultiIndex, read_csv, Timestamp
from pandas.util.testing import (assert_frame_equal, network,
get_data_path)

from pandas.util.testing import makeCustomDataframe as mkdf


def path2url(path):
return urlparse.urljoin(
'file:', urllib.pathname2url(path))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this you can take out


def _have_module(module_name):
try:
import_module(module_name)
Expand Down Expand Up @@ -292,7 +296,7 @@ def test_bad_url_protocol(self):
@slow
def test_file_url(self):
url = self.banklist_data
dfs = self.run_read_html('file://' + url, 'First',
dfs = self.run_read_html(path_to_url(url), 'First',
attrs={'id': 'table'})
self.assertIsInstance(dfs, list)
for df in dfs:
Expand Down Expand Up @@ -338,7 +342,7 @@ def test_multiindex_header_index_skiprows(self):
@slow
def test_regex_idempotency(self):
url = self.banklist_data
dfs = self.run_read_html('file://' + url,
dfs = self.run_read_html(path_to_url(url),
match=re.compile(re.compile('Florida')),
attrs={'id': 'table'})
self.assertIsInstance(dfs, list)
Expand Down Expand Up @@ -464,7 +468,7 @@ def test_invalid_flavor():

def get_elements_from_url(url, element='table', base_url="file://"):
_skip_if_none_of(('bs4', 'html5lib'))
url = "".join([base_url, url])
url = path_to_url(url) if base_url == "file://" else "".join([base_url, url])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be handled by path_to_url, e.g. if should check if the base part is correct so it doesn't dup this (and change the default to base_url=None; in which case path_to_url will add it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this mean that the prototype would be path_to_url(url, schema='file:') then it seems like less than optimal interface.

The root fault seems is in the test itself - it would seem more logical to eliminate base_url from get_elements_from_url rename the latter to get_elements_from_file.

from bs4 import BeautifulSoup
with urlopen(url) as f:
soup = BeautifulSoup(f, features='html5lib')
Expand Down