From 76cf1089d70f76ec75adfce95b334f63eaea7192 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 25 Mar 2020 17:30:29 +0700 Subject: [PATCH 1/2] add check --- pandas/core/computation/eval.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pandas/core/computation/eval.py b/pandas/core/computation/eval.py index a488aac08e060..6cdea1e4427cd 100644 --- a/pandas/core/computation/eval.py +++ b/pandas/core/computation/eval.py @@ -7,6 +7,8 @@ from typing import Optional import warnings +from pandas._config import get_option + from pandas._libs.lib import no_default from pandas.util._validators import validate_bool_kwarg @@ -39,10 +41,11 @@ def _check_engine(engine: Optional[str]) -> str: str Engine name. """ - from pandas.core.computation.check import _NUMEXPR_INSTALLED + from pandas.core.computation.expressions import _NUMEXPR_INSTALLED, _USE_NUMEXPR if engine is None: - engine = "numexpr" if _NUMEXPR_INSTALLED else "python" + use_numexpr = _USE_NUMEXPR and get_option("compute.use_numexpr") + engine = "numexpr" if use_numexpr else "python" if engine not in _engines: valid_engines = list(_engines.keys()) From f001140978c509527384fca2699d88f2573538d5 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 25 Mar 2020 17:45:47 +0700 Subject: [PATCH 2/2] logic fix --- pandas/core/computation/eval.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pandas/core/computation/eval.py b/pandas/core/computation/eval.py index 6cdea1e4427cd..70814cb2dc1cc 100644 --- a/pandas/core/computation/eval.py +++ b/pandas/core/computation/eval.py @@ -7,8 +7,6 @@ from typing import Optional import warnings -from pandas._config import get_option - from pandas._libs.lib import no_default from pandas.util._validators import validate_bool_kwarg @@ -44,8 +42,7 @@ def _check_engine(engine: Optional[str]) -> str: from pandas.core.computation.expressions import _NUMEXPR_INSTALLED, _USE_NUMEXPR if engine is None: - use_numexpr = _USE_NUMEXPR and get_option("compute.use_numexpr") - engine = "numexpr" if use_numexpr else "python" + engine = "numexpr" if _USE_NUMEXPR else "python" if engine not in _engines: valid_engines = list(_engines.keys())