From 0a8e008d403f0799b9561df5f43c04db507e7ac2 Mon Sep 17 00:00:00 2001 From: Almar Klein Date: Thu, 29 Jan 2026 10:16:15 +0100 Subject: [PATCH] new black" --- setup.py | 1 - tests/test_both.py | 1 - tests/test_server_apiserver.py | 1 - tests/test_server_assetserver.py | 1 - timetagger/__main__.py | 1 - timetagger/app/dialogs.py | 13 ++++--------- timetagger/app/dt.py | 7 ++----- timetagger/app/front.py | 1 - timetagger/app/stores.py | 13 ++++--------- timetagger/app/tools.py | 1 - timetagger/app/utils.py | 6 ++---- timetagger/images/_update_icons.py | 1 - timetagger/server/_apiserver.py | 1 - timetagger/server/_assets.py | 1 - timetagger/server/_utils.py | 1 - 15 files changed, 12 insertions(+), 38 deletions(-) diff --git a/setup.py b/setup.py index d2dbda1f..8ba9e126 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ from setuptools import find_packages, setup - with open("timetagger/__init__.py") as fh: VERSION = re.search(r"__version__ = \"(.*?)\"", fh.read()).group(1) diff --git a/tests/test_both.py b/tests/test_both.py index 7d08bea7..f6518c7c 100644 --- a/tests/test_both.py +++ b/tests/test_both.py @@ -4,7 +4,6 @@ import timetagger - server_fname = os.path.dirname(timetagger.server.__file__) client_fname = os.path.dirname(timetagger.app.__file__) diff --git a/tests/test_server_apiserver.py b/tests/test_server_apiserver.py index 62995723..b234c5a8 100644 --- a/tests/test_server_apiserver.py +++ b/tests/test_server_apiserver.py @@ -19,7 +19,6 @@ import itemdb - USER = "test" HEADERS = {} diff --git a/tests/test_server_assetserver.py b/tests/test_server_assetserver.py index 85f861ba..1cf16ef5 100644 --- a/tests/test_server_assetserver.py +++ b/tests/test_server_assetserver.py @@ -8,7 +8,6 @@ from asgineer.testutils import MockTestServer from _common import run_tests - # Create asset handler assets = {} assets.update(create_assets_from_dir(resources.files("timetagger.app"))) diff --git a/timetagger/__main__.py b/timetagger/__main__.py index b906519e..4cc1f370 100644 --- a/timetagger/__main__.py +++ b/timetagger/__main__.py @@ -41,7 +41,6 @@ enable_service_worker, ) - # Special hooks exit early if __name__ == "__main__" and len(sys.argv) >= 2: if sys.argv[1] in ("--version", "version"): diff --git a/timetagger/app/dialogs.py b/timetagger/app/dialogs.py index 638c7279..aac858ee 100644 --- a/timetagger/app/dialogs.py +++ b/timetagger/app/dialogs.py @@ -17,7 +17,6 @@ isNaN, ) - if this_is_js(): tools = window.tools dt = window.dt @@ -165,8 +164,7 @@ def csvsplit(s, sep, i=0): # so we should be fine with our own data. global RawJS parts = [] - RawJS( - """ + RawJS(""" var mode = 0; // 0: between fields, 1: unescaped, 2: escaped var sepcode = sep.charCodeAt(0); var lastsplit = i; @@ -215,8 +213,7 @@ def csvsplit(s, sep, i=0): parts[j] = val.slice(1, val.length-1).replace('""', '"'); } } - """ - ) + """) return parts, i @@ -2757,8 +2754,7 @@ def _show_records(self): record = window.store.records.get_by_key(key) ds = record.ds or "" date = dt.time2str(record.t1).split("T")[0] - lines.append( - f""" + lines.append(f""" {date} @@ -2768,8 +2764,7 @@ def _show_records(self): \uf682 {ds} - """ - ) + """) self._records_node.innerHTML = "
\n".join(lines) def _open_record(self, key): diff --git a/timetagger/app/dt.py b/timetagger/app/dt.py index 74dc22a4..eb561365 100644 --- a/timetagger/app/dt.py +++ b/timetagger/app/dt.py @@ -5,7 +5,6 @@ from pscript import this_is_js, RawJS from pscript.stubs import Date, isNaN, Math, window - DAYS_SHORT = [ "Sun", "Mon", @@ -401,8 +400,7 @@ def get_weeknumber(t): # From https://weeknumber.net/how-to/javascript date = Date(t * 1000) # noqa day_offfset = 7 - get_first_day_of_week() # noqa - RawJS( - """ + RawJS(""" date.setHours(0, 0, 0, 0); // Thursday in current week decides the year. date.setDate(date.getDate() + 3 - (date.getDay() + day_offfset) % 7); @@ -411,8 +409,7 @@ def get_weeknumber(t): // Adjust to Thursday in week 1 and count number of weeks from date to week1. var res = 1 + Math.round(((date.getTime() - week1.getTime()) / 86400000 - 3 + (week1.getDay() + 6) % 7) / 7); - """ - ) + """) return res # noqa diff --git a/timetagger/app/front.py b/timetagger/app/front.py index 2b20154f..3910818f 100644 --- a/timetagger/app/front.py +++ b/timetagger/app/front.py @@ -5,7 +5,6 @@ from pscript import this_is_js from pscript.stubs import window, Math, time, perf_counter - if this_is_js(): dt = window.dt utils = window.utils diff --git a/timetagger/app/stores.py b/timetagger/app/stores.py index 904d0b98..fc94a37d 100644 --- a/timetagger/app/stores.py +++ b/timetagger/app/stores.py @@ -27,7 +27,6 @@ from pscript import this_is_js from pscript.stubs import Math, Date, JSON, window, console, RawJS - if this_is_js(): # pragma: no cover tools = window.tools utils = window.utils @@ -35,29 +34,25 @@ random = Math.random def to_int(x): - RawJS( - """ + RawJS(""" x = Number(x) if (!isFinite(x)) { var e = new Error("TypeError: Cannot convert to int"); e.name = "TypeError"; throw e; } - """ - ) + """) return Math.floor(x) def to_float(x): - RawJS( - """ + RawJS(""" x = Number(x) if (!isFinite(x)) { var e = new Error("TypeError: Cannot convert to int"); e.name = "TypeError"; throw e; } - """ - ) + """) return x def to_str(x): diff --git a/timetagger/app/tools.py b/timetagger/app/tools.py index f12e1f64..8980e456 100644 --- a/timetagger/app/tools.py +++ b/timetagger/app/tools.py @@ -7,7 +7,6 @@ from pscript.stubs import window, JSON, localStorage, location, console, fetch - # %% General diff --git a/timetagger/app/utils.py b/timetagger/app/utils.py index 4139d012..ebdc63d8 100644 --- a/timetagger/app/utils.py +++ b/timetagger/app/utils.py @@ -22,8 +22,7 @@ def looks_like_desktop(): # hue is a number between 0 and 360, saturation and lightness are numbers between 0 and 100. # returns an array of 3 numbers between 0 and 1, for the r, g, and b channel. def _get_hsluv2rgb(): - RawJS( - """ + RawJS(""" function f(a){var c=[],b=Math.pow(a+16,3)/1560896;b=b>g?b:a/k;for(var d=0;3>d;){var e=d++,h=l[e][0],w=l[e][1];e=l[e][2];for(var x=0;2>x;){var y=x++,z=(632260*e-126452*w)*b+126452*y;c.push({b:(284517*h-94839*e)*b/z,a:((838422*e+769860*w+731718*h)*a*b-769860*y*a)/z})}}return c} function m(a){a=f(a);for(var c=Infinity,b=0;b