Skip to content

Commit 50c522c

Browse files
authored
don't check if installed, check if imported (#158)
1 parent d7b1d68 commit 50c522c

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

src/inspectorscripts.ts

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,19 @@ __ipywidgets = None
3636
3737
def _check_imported():
3838
global __np, __pd, __pyspark, __tf, __K, __ipywidgets
39-
pkg_resources = [dist.project_name.replace("Python","") for
40-
dist in __import__("pkg_resources").working_set]
41-
if 'numpy' in pkg_resources:
39+
40+
if 'numpy' in sys.modules:
4241
# don't really need the try
43-
try:
44-
import numpy as __np
45-
except ImportError:
46-
__np = None
42+
import numpy as __np
4743
48-
if 'pandas' in pkg_resources:
49-
try:
50-
import pandas as __pd
51-
except ImportError:
52-
__pd = None
44+
if 'pandas' in sys.modules:
45+
import pandas as __pd
5346
54-
if 'pyspark' in pkg_resources:
55-
try:
56-
import pyspark as __pyspark
57-
except ImportError:
58-
__pyspark = None
47+
if 'pyspark' in sys.modules:
48+
import pyspark as __pyspark
5949
60-
if 'tensorflow' in pkg_resources or 'keras' in pkg_resources:
61-
try:
62-
import tensorflow as __tf
63-
except ImportError:
64-
__tf = None
50+
if 'tensorflow' in sys.modules or 'keras' in sys.modules:
51+
import tensorflow as __tf
6552
6653
try:
6754
import keras.backend as __K
@@ -71,13 +58,8 @@ def _check_imported():
7158
except ImportError:
7259
__K = None
7360
74-
75-
76-
if 'ipywidgets' in pkg_resources:
77-
try:
78-
import ipywidgets as __ipywidgets
79-
except ImportError:
80-
__ipywidgets = None
61+
if 'ipywidgets' in sys.modules:
62+
import ipywidgets as __ipywidgets
8163
8264
8365
def _jupyterlab_variableinspector_getsizeof(x):

0 commit comments

Comments
 (0)