Skip to content

Commit

Permalink
BUG: Improved thread safety for read_html() GH16928
Browse files Browse the repository at this point in the history
  • Loading branch information
3553x committed Jul 16, 2017
1 parent 7ffe7fc commit ad8541b
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
2 changes: 2 additions & 0 deletions doc/source/whatsnew/v0.21.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ I/O

- Bug in :func:`read_stata` where value labels could not be read when using an iterator (:issue:`16923`)

- Bug in :func:`read_html` importcheck fails when run concurrently (:issue:`16928`)

Plotting
^^^^^^^^
- Bug in plotting methods using ``secondary_y`` and ``fontsize`` not setting secondary axis font size (:issue:`12565`)
Expand Down
4 changes: 2 additions & 2 deletions pandas/io/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ def _importers():
if _IMPORTS:
return

_IMPORTS = True

global _HAS_BS4, _HAS_LXML, _HAS_HTML5LIB

try:
Expand All @@ -59,6 +57,8 @@ def _importers():
except ImportError:
pass

_IMPORTS = True


#############
# READ HTML #
Expand Down
30 changes: 30 additions & 0 deletions pandas/tests/io/test_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
import glob
import os
import re
import threading
import warnings

try:
from importlib import import_module
except ImportError:
import_module = __import__

try:
from importlib import reload
except ImportError:
pass

from distutils.version import LooseVersion

import pytest
Expand All @@ -22,6 +28,7 @@
from pandas.compat import (map, zip, StringIO, string_types, BytesIO,
is_platform_windows, PY3)
from pandas.io.common import URLError, urlopen, file_path_to_url
import pandas.io.html
from pandas.io.html import read_html
from pandas._libs.parsers import ParserError

Expand Down Expand Up @@ -931,3 +938,26 @@ def test_same_ordering():
dfs_lxml = read_html(filename, index_col=0, flavor=['lxml'])
dfs_bs4 = read_html(filename, index_col=0, flavor=['bs4'])
assert_framelist_equal(dfs_lxml, dfs_bs4)


class ErrorThread(threading.Thread):
def run(self):
try:
super(ErrorThread, self).run()
except Exception as e:
self.err = e
else:
self.err = None


@pytest.mark.slow
def test_importcheck_thread_safety():
reload(pandas.io.html)
filename = os.path.join(DATA_PATH, 'valid_markup.html')
helper_thread1 = ErrorThread(target=read_html, args=(filename,))
helper_thread2 = ErrorThread(target=read_html, args=(filename,))
helper_thread1.start()
helper_thread2.start()
while(helper_thread1.is_alive() or helper_thread2.is_alive()):
pass
assert None is helper_thread1.err is helper_thread2.err

0 comments on commit ad8541b

Please sign in to comment.