diff options
| author | Davies Liu <davies@databricks.com> | 2015-08-13 14:03:55 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-08-13 14:04:01 -0700 |
| commit | 2c7f8da58085f5badf765c92cd5de8d91307e858 (patch) | |
| tree | 24fd8803b2469035798f3d7f0ef4a77c021109dc /python/pyspark/sql/context.py | |
| parent | 875ecc7f61bf487ad8291e3c867a45f25c8852da (diff) | |
| download | spark-2c7f8da58085f5badf765c92cd5de8d91307e858.tar.gz spark-2c7f8da58085f5badf765c92cd5de8d91307e858.tar.bz2 spark-2c7f8da58085f5badf765c92cd5de8d91307e858.zip | |
[SPARK-9942] [PYSPARK] [SQL] ignore exceptions while try to import pandas
If pandas is broken (can't be imported, raise other exceptions other than ImportError), pyspark can't be imported, we should ignore all the exceptions.
Author: Davies Liu <davies@databricks.com>
Closes #8173 from davies/fix_pandas.
(cherry picked from commit a8d2f4c5f92210a09c846711bd7cc89a43e2edd2)
Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'python/pyspark/sql/context.py')
| -rw-r--r-- | python/pyspark/sql/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/sql/context.py b/python/pyspark/sql/context.py index 917de24f35..0ef46c4464 100644 --- a/python/pyspark/sql/context.py +++ b/python/pyspark/sql/context.py @@ -39,7 +39,7 @@ from pyspark.sql.functions import UserDefinedFunction try: import pandas has_pandas = True -except ImportError: +except Exception: has_pandas = False __all__ = ["SQLContext", "HiveContext", "UDFRegistration"] |