forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-19505][PYTHON] AttributeError on Exception.message in Python3
## What changes were proposed in this pull request? Added `util._message_exception` helper to use `str(e)` when `e.message` is unavailable (Python3). Grepped for all occurrences of `.message` in `pyspark/` and these were the only occurrences. ## How was this patch tested? - Doctests for helper function ## Legal This is my original work and I license the work to the project under the project’s open source license. Author: David Gingrich <david@textio.com> Closes apache#16845 from dgingrich/topic-spark-19505-py3-exceptions.
- Loading branch information
David Gingrich
authored and
Mingjie Tang
committed
Apr 18, 2017
1 parent
37bc506
commit 246d00a
Showing
4 changed files
with
54 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -340,6 +340,7 @@ def __hash__(self): | |
"pyspark.profiler", | ||
"pyspark.shuffle", | ||
"pyspark.tests", | ||
"pyspark.util", | ||
] | ||
) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
__all__ = [] | ||
|
||
|
||
def _exception_message(excp): | ||
"""Return the message from an exception as either a str or unicode object. Supports both | ||
Python 2 and Python 3. | ||
>>> msg = "Exception message" | ||
>>> excp = Exception(msg) | ||
>>> msg == _exception_message(excp) | ||
True | ||
>>> msg = u"unicöde" | ||
>>> excp = Exception(msg) | ||
>>> msg == _exception_message(excp) | ||
True | ||
""" | ||
if hasattr(excp, "message"): | ||
return excp.message | ||
return str(excp) | ||
|
||
|
||
if __name__ == "__main__": | ||
import doctest | ||
(failure_count, test_count) = doctest.testmod() | ||
if failure_count: | ||
exit(-1) |