From 28ce1a6e24b5feda256e880c7e170bfc4c8b81f2 Mon Sep 17 00:00:00 2001 From: mummified-corroding-granny Date: Sat, 28 Jan 2023 06:46:33 +0000 Subject: [PATCH 1/2] change function name imports in routes --- files/routes/admin.py | 2 +- files/routes/static.py | 2 +- files/routes/subs.py | 2 +- files/routes/users.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 56f7265f8..69b1c6538 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -2,7 +2,7 @@ import time from urllib.parse import quote, urlencode from math import floor -from sqlalchemy import nullslast +from sqlalchemy import nulls_last from sqlalchemy.exc import IntegrityError from psycopg2.errors import UniqueViolation diff --git a/files/routes/static.py b/files/routes/static.py index 021fbccdb..00594153c 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -1,7 +1,7 @@ import os from shutil import copyfile -from sqlalchemy import func, nullslast +from sqlalchemy import func, nulls_last from files.helpers.media import process_files import files.helpers.stats as statshelper diff --git a/files/routes/subs.py b/files/routes/subs.py index 5eec21515..6d5974fb5 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -1,4 +1,4 @@ -from sqlalchemy import nullslast +from sqlalchemy import nulls_last from files.classes import * from files.helpers.alerts import * diff --git a/files/routes/users.py b/files/routes/users.py index 3bf57c05c..85132ff53 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -7,7 +7,7 @@ from typing import Literal import gevent import qrcode -from sqlalchemy import nullslast +from sqlalchemy import nulls_last from sqlalchemy.orm import aliased from files.classes import * -- 2.34.1 From 76554713008cd73f2ad199c4b7d231e34b030f39 Mon Sep 17 00:00:00 2001 From: mummified-corroding-granny Date: Sat, 28 Jan 2023 07:52:57 +0000 Subject: [PATCH 2/2] replace more calls from nullslast to nulls_last --- files/routes/subs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/routes/subs.py b/files/routes/subs.py index 6d5974fb5..0cf58d429 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -201,7 +201,7 @@ def sub_exilees(v:User, sub): abort(403) users = g.db.query(User, Exile).join(Exile, Exile.user_id==User.id) \ .filter_by(sub=sub.name) \ - .order_by(nullslast(Exile.created_utc.desc()), User.username).all() + .order_by(nulls_last(Exile.created_utc.desc()), User.username).all() return render_template("sub/exilees.html", v=v, sub=sub, users=users) @@ -215,7 +215,7 @@ def sub_blockers(v:User, sub): abort(403) users = g.db.query(User, SubBlock).join(SubBlock) \ .filter_by(sub=sub.name) \ - .order_by(nullslast(SubBlock.created_utc.desc()), User.username).all() + .order_by(nulls_last(SubBlock.created_utc.desc()), User.username).all() return render_template("sub/blockers.html", v=v, sub=sub, users=users, verb="blocking") @@ -230,7 +230,7 @@ def sub_followers(v:User, sub): abort(403) users = g.db.query(User, SubSubscription).join(SubSubscription) \ .filter_by(sub=sub.name) \ - .order_by(nullslast(SubSubscription.created_utc.desc()), User.username).all() + .order_by(nulls_last(SubSubscription.created_utc.desc()), User.username).all() return render_template("sub/blockers.html", v=v, sub=sub, users=users, verb="following") -- 2.34.1