diff options
author | lufte <javier@lufte.net> | 2021-06-30 01:14:36 -0300 |
---|---|---|
committer | lufte <javier@lufte.net> | 2021-06-30 01:14:36 -0300 |
commit | 86364c1e8fd9dc079d420f9dcd13c0abf75346ce (patch) | |
tree | 145162c26160d3bea9513c40373aa1d5964df1d4 /qutebrowser | |
parent | 3b87db9059ff0d25cadff00dfb179d99486c9219 (diff) | |
download | qutebrowser-86364c1e8fd9dc079d420f9dcd13c0abf75346ce.tar.gz qutebrowser-86364c1e8fd9dc079d420f9dcd13c0abf75346ce.zip |
Pave the way for pathlib migration
Diffstat (limited to 'qutebrowser')
-rw-r--r-- | qutebrowser/app.py | 3 | ||||
-rw-r--r-- | qutebrowser/browser/history.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/qutebrowser/app.py b/qutebrowser/app.py index ead9e9bcd..1ab28e8d0 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -41,6 +41,7 @@ import os import sys import functools import tempfile +import pathlib import datetime import argparse from typing import Iterable, Optional @@ -480,7 +481,7 @@ def _init_modules(*, args): with debug.log_time("init", "Initializing SQL/history"): try: log.init.debug("Initializing web history...") - history.init(db_path=os.path.join(standarddir.data(), 'history.sqlite'), + history.init(db_path=pathlib.Path(standarddir.data()) / 'history.sqlite', parent=objects.qapp) except sql.KnownError as e: error.handle_fatal_exc(e, 'Error initializing SQL', diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index 779737987..ada8bf0a6 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -22,6 +22,7 @@ import os import time import contextlib +import pathlib from typing import cast, Mapping, MutableSequence from PyQt5.QtCore import pyqtSlot, QUrl, QObject, pyqtSignal @@ -477,7 +478,7 @@ def debug_dump_history(dest): raise cmdutils.CommandError(f'Could not write history: {e}') -def init(db_path: str, parent: QObject = None) -> None: +def init(db_path: pathlib.Path, parent: QObject = None) -> None: """Initialize the web history. Args: @@ -486,7 +487,7 @@ def init(db_path: str, parent: QObject = None) -> None: """ global web_history progress = HistoryProgress() - database = sql.Database(db_path) + database = sql.Database(str(db_path)) web_history = WebHistory(database=database, progress=progress, parent=parent) if objects.backend == usertypes.Backend.QtWebKit: # pragma: no cover |