BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-27 14:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning about deprecated module: imp (#6362)

Browse Source
This commit is contained in:
Neil Girdhar
2021-06-17 16:02:22 -04:00
committed by GitHub
parent c58ae94225
commit 8fd7861b75
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/flatbuffers/compat.py
View File

@@ -16,7 +16,6 @@
compatibility helpers for numpy. """ compatibility helpers for numpy. """
import sys import sys
import imp
PY2 = sys.version_info[0] == 2 PY2 = sys.version_info[0] == 2
PY26 = sys.version_info[0:2] == (2, 6) PY26 = sys.version_info[0:2] == (2, 6)
@@ -26,12 +25,14 @@ PY3 = sys.version_info[0] == 3
PY34 = sys.version_info[0:2] >= (3, 4) PY34 = sys.version_info[0:2] >= (3, 4)
if PY3: if PY3:
import importlib.machinery
string_types = (str,) string_types = (str,)
binary_types = (bytes,bytearray) binary_types = (bytes,bytearray)
range_func = range range_func = range
memoryview_type = memoryview memoryview_type = memoryview
struct_bool_decl = "?" struct_bool_decl = "?"
else: else:
import imp
string_types = (unicode,) string_types = (unicode,)
if PY26 or PY27: if PY26 or PY27:
binary_types = (str,bytearray) binary_types = (str,bytearray)
@@ -52,11 +53,15 @@ def import_numpy():
Returns the numpy module if it exists on the system, Returns the numpy module if it exists on the system,
otherwise returns None. otherwise returns None.
""" """
try: if PY3:
imp.find_module('numpy') numpy_exists = (
numpy_exists = True importlib.machinery.PathFinder.find_spec('numpy') is not None)
except ImportError: else:
numpy_exists = False try:
imp.find_module('numpy')
numpy_exists = True
except ImportError:
numpy_exists = False
if numpy_exists: if numpy_exists:
# We do this outside of try/except block in case numpy exists # We do this outside of try/except block in case numpy exists