Add ClipboardError superexception
This commit is contained in:
parent
7d0064ff86
commit
63b9b61e75
@ -855,7 +855,7 @@ class CommandDispatcher:
|
|||||||
sel = False
|
sel = False
|
||||||
try:
|
try:
|
||||||
text = utils.get_clipboard(selection=sel)
|
text = utils.get_clipboard(selection=sel)
|
||||||
except utils.ClipboardEmptyError as e:
|
except utils.ClipboardError as e:
|
||||||
raise cmdexc.CommandError(e)
|
raise cmdexc.CommandError(e)
|
||||||
text_urls = [u for u in text.split('\n') if u.strip()]
|
text_urls = [u for u in text.split('\n') if u.strip()]
|
||||||
if (len(text_urls) > 1 and not urlutils.is_url(text_urls[0]) and
|
if (len(text_urls) > 1 and not urlutils.is_url(text_urls[0]) and
|
||||||
|
@ -70,7 +70,7 @@ def replace_variables(win_id, arglist):
|
|||||||
values[var] = func()
|
values[var] = func()
|
||||||
arg = arg.replace(var, values[var])
|
arg = arg.replace(var, values[var])
|
||||||
args.append(arg)
|
args.append(arg)
|
||||||
except utils.ClipboardEmptyError as e:
|
except utils.ClipboardError as e:
|
||||||
raise cmdexc.CommandError(e)
|
raise cmdexc.CommandError(e)
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
@ -47,8 +47,7 @@ class MinimalLineEditMixin:
|
|||||||
if e.key() == Qt.Key_Insert and e.modifiers() == Qt.ShiftModifier:
|
if e.key() == Qt.Key_Insert and e.modifiers() == Qt.ShiftModifier:
|
||||||
try:
|
try:
|
||||||
text = utils.get_clipboard(selection=True)
|
text = utils.get_clipboard(selection=True)
|
||||||
except (utils.SelectionUnsupportedError,
|
except utils.ClipboardError:
|
||||||
utils.ClipboardEmptyError):
|
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
e.accept()
|
e.accept()
|
||||||
|
@ -43,12 +43,17 @@ fake_clipboard = None
|
|||||||
log_clipboard = False
|
log_clipboard = False
|
||||||
|
|
||||||
|
|
||||||
class SelectionUnsupportedError(Exception):
|
class ClipboardError(Exception):
|
||||||
|
|
||||||
|
"""Raised if the clipboard contents are unavailable for some reason."""
|
||||||
|
|
||||||
|
|
||||||
|
class SelectionUnsupportedError(ClipboardError):
|
||||||
|
|
||||||
"""Raised if [gs]et_clipboard is used and selection=True is unsupported."""
|
"""Raised if [gs]et_clipboard is used and selection=True is unsupported."""
|
||||||
|
|
||||||
|
|
||||||
class ClipboardEmptyError(Exception):
|
class ClipboardEmptyError(ClipboardError):
|
||||||
|
|
||||||
"""Raised if get_clipboard is used and the clipboard is empty."""
|
"""Raised if get_clipboard is used and the clipboard is empty."""
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user