Index: tools/telemetry/telemetry/util/external_modules.py |
diff --git a/tools/telemetry/telemetry/util/external_modules.py b/tools/telemetry/telemetry/util/external_modules.py |
index 4d2bc83515db391c8684bb968a607e9c5f88f968..6a504aeb353121d37f2bebe8c1ff150389511b9c 100644 |
--- a/tools/telemetry/telemetry/util/external_modules.py |
+++ b/tools/telemetry/telemetry/util/external_modules.py |
@@ -11,9 +11,11 @@ MODULES = { |
'numpy': (version.StrictVersion('1.6.1'), None), |
} |
-def ImportOptionalModule(module): |
+def ImportRequiredModule(module): |
"""Tries to import the desired module. |
+ Returns: |
+ The module on success, raises error on failure. |
Raises: |
ImportError: The import failed.""" |
versions = MODULES.get(module) |
@@ -41,3 +43,13 @@ def ImportOptionalModule(module): |
else: |
raise |
return module |
+ |
+def ImportOptionalModule(module): |
+ """Tries to import the desired module. |
+ |
+ Returns: |
+ The module if successful, None if not.""" |
+ try: |
+ return ImportRequiredModule(module) |
+ except ImportError: |
+ return None |