summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-09-26 07:06:52 -0700
committerGitHub <noreply@github.com>2021-09-26 07:06:52 -0700
commit749eab576b95a40d87dfc1026b5038fbbf030f8e (patch)
treec627de22ba3e770bd210e0a23f4ce7ef45fb1d47
parent737cf793f5e5625c36e3627250beee34ee285f9d (diff)
parent905b1bfd6e90f0fd6a2d4f0afa08f8ddebc4f488 (diff)
downloadclick-749eab576b95a40d87dfc1026b5038fbbf030f8e.tar.gz
Merge pull request #2074 from pallets/except-chain
use exception chaining
-rw-r--r--src/click/_termui_impl.py2
-rw-r--r--src/click/core.py2
-rw-r--r--src/click/decorators.py2
-rw-r--r--src/click/globals.py4
-rw-r--r--src/click/termui.py8
-rw-r--r--src/click/utils.py2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/click/_termui_impl.py b/src/click/_termui_impl.py
index c860101..39c1d08 100644
--- a/src/click/_termui_impl.py
+++ b/src/click/_termui_impl.py
@@ -498,7 +498,7 @@ class Editor:
except OSError as e:
raise ClickException(
_("{editor}: Editing failed: {e}").format(editor=editor, e=e)
- )
+ ) from e
def edit(self, text: t.Optional[t.AnyStr]) -> t.Optional[t.AnyStr]:
import tempfile
diff --git a/src/click/core.py b/src/click/core.py
index a1568bd..5bbc90c 100644
--- a/src/click/core.py
+++ b/src/click/core.py
@@ -1061,7 +1061,7 @@ class BaseCommand:
ctx.exit()
except (EOFError, KeyboardInterrupt):
echo(file=sys.stderr)
- raise Abort()
+ raise Abort() from None
except ClickException as e:
if not standalone_mode:
raise
diff --git a/src/click/decorators.py b/src/click/decorators.py
index fa8c6f7..f1cc005 100644
--- a/src/click/decorators.py
+++ b/src/click/decorators.py
@@ -380,7 +380,7 @@ def version_option(
raise RuntimeError(
f"{package_name!r} is not installed. Try passing"
" 'package_name' instead."
- )
+ ) from None
if version is None:
raise RuntimeError(
diff --git a/src/click/globals.py b/src/click/globals.py
index cfcade1..a7b0c93 100644
--- a/src/click/globals.py
+++ b/src/click/globals.py
@@ -36,9 +36,9 @@ def get_current_context(silent: bool = False) -> t.Optional["Context"]:
"""
try:
return t.cast("Context", _local.stack[-1])
- except (AttributeError, IndexError):
+ except (AttributeError, IndexError) as e:
if not silent:
- raise RuntimeError("There is no active click context.")
+ raise RuntimeError("There is no active click context.") from e
return None
diff --git a/src/click/termui.py b/src/click/termui.py
index 034fe6e..08fd898 100644
--- a/src/click/termui.py
+++ b/src/click/termui.py
@@ -147,7 +147,7 @@ def prompt(
# A doc bug has been filed at https://bugs.python.org/issue24711
if hide_input:
echo(None, err=err)
- raise Abort()
+ raise Abort() from None
if value_proc is None:
value_proc = convert_type(type, default)
@@ -234,7 +234,7 @@ def confirm(
echo(prompt, nl=False, err=err)
value = visible_prompt_func("").lower().strip()
except (KeyboardInterrupt, EOFError):
- raise Abort()
+ raise Abort() from None
if value in ("y", "yes"):
rv = True
elif value in ("n", "no"):
@@ -581,13 +581,13 @@ def style(
try:
bits.append(f"\033[{_interpret_color(fg)}m")
except KeyError:
- raise TypeError(f"Unknown color {fg!r}")
+ raise TypeError(f"Unknown color {fg!r}") from None
if bg:
try:
bits.append(f"\033[{_interpret_color(bg, 10)}m")
except KeyError:
- raise TypeError(f"Unknown color {bg!r}")
+ raise TypeError(f"Unknown color {bg!r}") from None
if bold is not None:
bits.append(f"\033[{1 if bold else 22}m")
diff --git a/src/click/utils.py b/src/click/utils.py
index 91a372d..16033d6 100644
--- a/src/click/utils.py
+++ b/src/click/utils.py
@@ -154,7 +154,7 @@ class LazyFile:
except OSError as e: # noqa: E402
from .exceptions import FileError
- raise FileError(self.name, hint=e.strerror)
+ raise FileError(self.name, hint=e.strerror) from e
self._f = rv
return rv