diff --git a/scripts/browser_history.py b/scripts/browser_history.py index b550cf33..e3c846d9 100755 --- a/scripts/browser_history.py +++ b/scripts/browser_history.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 DEPRECATION = 'NOTE: this is DEPRECATED! Please use https://github.com/seanbreckenridge/browserexport instead' -from datetime import datetime +from datetime import datetime, timezone from pathlib import Path from subprocess import check_output import filecmp @@ -70,7 +70,7 @@ def backup_history(browser: Browser, to: Path, profile: str='*', pattern=None) - assert to.is_dir() logger = get_logger() - now = format_dt(datetime.utcnow()) + now = format_dt(datetime.now(tz=timezone.utc)) path = get_path(browser, profile=profile) @@ -99,7 +99,7 @@ def guess_db_date(db: Path) -> str: '-csv', db, 'SELECT max(datetime(((visits.visit_time/1000000)-11644473600), "unixepoch")) FROM visits;' - ]).decode('utf8').strip().strip('"'); + ]).decode('utf8').strip().strip('"') return format_dt(datetime.strptime(maxvisit, "%Y-%m-%d %H:%M:%S")) diff --git a/src/promnesia/sources/takeout_legacy.py b/src/promnesia/sources/takeout_legacy.py index 66c18d39..675397a6 100644 --- a/src/promnesia/sources/takeout_legacy.py +++ b/src/promnesia/sources/takeout_legacy.py @@ -113,7 +113,7 @@ def read_browser_history_json(takeout: TakeoutPath) -> Iterable[Visit]: hist = j['Browser History'] for item in hist: url = item['url'] - time = datetime.utcfromtimestamp(item['time_usec'] / 10 ** 6).replace(tzinfo=pytz.utc) + time = datetime.fromtimestamp(item['time_usec'] / 10 ** 6, tz=pytz.utc) # TODO any more interesitng info? yield Visit( url=url, diff --git a/src/promnesia/tests/test_extract.py b/src/promnesia/tests/test_extract.py index ed200c0d..d140f7af 100644 --- a/src/promnesia/tests/test_extract.py +++ b/src/promnesia/tests/test_extract.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timezone from ..common import Visit, DbVisit, Loc, Source from ..extract import extract_visits @@ -14,9 +14,9 @@ class ExtractionError(Exception): pass def indexer(): - yield Visit(url='http://test1', dt=datetime.utcfromtimestamp(0), locator=Loc.make('whatever')) + yield Visit(url='http://test1', dt=datetime.fromtimestamp(0, tz=timezone.utc), locator=Loc.make('whatever')) yield ExtractionError() - yield Visit(url='http://test2', dt=datetime.utcfromtimestamp(0), locator=Loc.make('whatever')) + yield Visit(url='http://test2', dt=datetime.fromtimestamp(0, tz=timezone.utc), locator=Loc.make('whatever')) [v1, e, v2] = extract_visits(source=Source(indexer), src='whatever') assert isinstance(v1, DbVisit)