rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mypy: Fix :session-save

Browse Source 
We use a sentinel value for the argument so we can check whether the default
was used. To express that in the type system, it needs a separate class.
This commit is contained in:
Florian Bruhin 2018-11-22 15:02:41 +01:00
parent 8b1fd83366
commit 12b26512fc
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qutebrowser/misc/sessions.py
View File

@ -23,6 +23,7 @@ import os
import os.path import os.path
import itertools import itertools
import urllib import urllib
import typing
from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
@ -37,7 +38,12 @@ from qutebrowser.mainwindow import mainwindow
from qutebrowser.qt import sip from qutebrowser.qt import sip
default = object() # Sentinel value class Sentinel:
pass
default = Sentinel()
def init(parent=None): def init(parent=None):
@ -109,7 +115,7 @@ class SessionManager(QObject):
def __init__(self, base_path, parent=None): def __init__(self, base_path, parent=None):
super().__init__(parent) super().__init__(parent)
self._current = None self._current = None # type: typing.Optional[str]
self._base_path = base_path self._base_path = base_path
self._last_window_session = None self._last_window_session = None
self.did_load = False self.did_load = False
@ -504,8 +510,9 @@ class SessionManager(QObject):
@cmdutils.argument('name', completion=miscmodels.session) @cmdutils.argument('name', completion=miscmodels.session)
@cmdutils.argument('win_id', win_id=True) @cmdutils.argument('win_id', win_id=True)
@cmdutils.argument('with_private', flag='p') @cmdutils.argument('with_private', flag='p')
def session_save(self, name: str = default, current=False, quiet=False, def session_save(self, name: typing.Union[str, Sentinel] = default,
force=False, only_active_window=False, with_private=False, current=False, quiet=False, force=False,
only_active_window=False, with_private=False,
win_id=None): win_id=None):
"""Save a session. """Save a session.
@ -518,7 +525,9 @@ class SessionManager(QObject):
only_active_window: Saves only tabs of the currently active window. only_active_window: Saves only tabs of the currently active window.
with_private: Include private windows. with_private: Include private windows.
""" """
if name is not default and name.startswith('_') and not force: if (not isinstance(name, Sentinel) and
name.startswith('_') and
not force):
raise cmdexc.CommandError("{} is an internal session, use --force " raise cmdexc.CommandError("{} is an internal session, use --force "
"to save anyways.".format(name)) "to save anyways.".format(name))
if current: if current: