Upgrade imports for Flask 3.0

hasjob/__init__.py

@@ -3,8 +3,6 @@
 import geoip2.database
 from flask import Flask
 from flask_assets import Bundle
-from flask_lastuser import Lastuser
-from flask_lastuser.sqlalchemy import UserManager
 from flask_mail import Mail
 from flask_migrate import Migrate
 from flask_redis import FlaskRedis
@@ -13,6 +11,8 @@
 import coaster.app
 from baseframe import Version, assets, baseframe
 from coaster.assets import WebpackManifest
+from flask_lastuser import Lastuser
+from flask_lastuser.sqlalchemy import UserManager
 
 from ._version import __version__
 from .uploads import configure as uploads_configure

hasjob/forms/board.py

@@ -1,5 +1,5 @@
 import tldextract
-from flask import Markup
+from markupsafe import Markup
 
 import baseframe.forms as forms
 from baseframe import _, __

hasjob/forms/domain.py

@@ -1,4 +1,4 @@
-# from flask import Markup
+# from markupsafe import Markup
 import baseframe.forms as forms
 from baseframe import __
 

hasjob/forms/filterset.py

@@ -74,7 +74,7 @@ class FiltersetForm(forms.Form):
         __("Tags"), autocomplete_endpoint='/api/1/tag/autocomplete', results_key='tags'
     )
 
-    def set_queries(self):
+    def __post_init__(self):
         if not self.edit_parent:
             self.edit_parent = g.board
         self.types.query = (

hasjob/forms/jobpost.py

@@ -2,13 +2,14 @@
 from decimal import Decimal, InvalidOperation
 from difflib import SequenceMatcher
 
-from flask import Markup, g, request
-from flask_lastuser import LastuserResourceError
+from flask import g, request
+from markupsafe import Markup
 
 import baseframe.forms as forms
 from baseframe import _, __
 from baseframe.utils import is_public_email_domain
 from coaster.utils import get_email_domain, getbool
+from flask_lastuser import LastuserResourceError
 
 from .. import app, lastuser
 from ..models import CURRENCY, PAY_TYPE, Domain, JobApplication, JobType, User

hasjob/models/board.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from flask import Markup, url_for
+from flask import url_for
+from markupsafe import Markup
 from pytz import timezone
 from sqlalchemy.ext.associationproxy import association_proxy
 from werkzeug.utils import cached_property

hasjob/models/campaign.py

@@ -2,7 +2,8 @@
 
 from datetime import timedelta
 
-from flask import Markup, request
+from flask import request
+from markupsafe import Markup
 from sqlalchemy import event
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.orderinglist import ordering_list

hasjob/models/jobpost.py

@@ -3,8 +3,9 @@
 from datetime import timedelta
 
 import tldextract
-from flask import Markup, escape, url_for
+from flask import url_for
 from flask_babel import format_datetime
+from markupsafe import Markup, escape
 from sqlalchemy import event
 from sqlalchemy.dialects.postgresql import TSVECTOR
 from sqlalchemy.ext.associationproxy import association_proxy

hasjob/models/user.py

@@ -4,11 +4,11 @@
 from uuid import uuid4
 
 from flask import request
-from flask_lastuser.sqlalchemy import UserBase2
 
 from baseframe import _, cache
 from coaster.sqlalchemy import JsonDict, UuidMixin
 from coaster.utils import utcnow
+from flask_lastuser.sqlalchemy import UserBase2
 
 from . import BaseMixin, Model, backref, db, relationship, sa
 

hasjob/views/campaign.py

@@ -4,7 +4,8 @@
 from functools import wraps
 from io import StringIO
 
-from flask import Markup, abort, flash, g, redirect, render_template, request, url_for
+from flask import abort, flash, g, redirect, render_template, request, url_for
+from markupsafe import Markup
 from pytz import UTC
 
 from baseframe import __

hasjob/views/helper.py

@@ -7,16 +7,17 @@
 from uuid import uuid4
 
 import bleach
-from flask import Markup, copy_current_request_context, g, request, session
-from flask_lastuser import signal_user_looked_up
+from flask import copy_current_request_context, g, request, session
 from geoip2.errors import AddressNotFoundError
+from markupsafe import Markup
 from pytz import UTC
 from sqlalchemy.exc import IntegrityError
 
 from baseframe import _, cache
 from baseframe.signals import form_validation_error, form_validation_success
 from coaster.sqlalchemy import failsafe_add
 from coaster.utils import utcnow
+from flask_lastuser import signal_user_looked_up
 
 from .. import app, lastuser, redis_store, rq
 from ..extapi import location_geodata

hasjob/views/index.py

@@ -3,7 +3,6 @@
 from uuid import uuid4
 
 from flask import (
-    Markup,
     Response,
     abort,
     flash,
@@ -14,6 +13,7 @@
     request,
     url_for,
 )
+from markupsafe import Markup
 
 from baseframe import _, request_is_xhr
 from coaster.utils import ParseError, getbool, parse_isoformat, utcnow

hasjob/views/listing.py

@@ -3,7 +3,6 @@
 
 import bleach
 from flask import (
-    Markup,
     abort,
     flash,
     g,
@@ -16,6 +15,7 @@
 )
 from flask_mail import Message
 from html2text import html2text
+from markupsafe import Markup
 from premailer import transform as email_transform
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import StaleDataError

hasjob/views/login.py

@@ -1,8 +1,8 @@
 from flask import Response, flash, g, redirect
-from flask_lastuser import signal_user_session_refreshed
 from sqlalchemy.exc import IntegrityError
 
 from coaster.views import get_next_url
+from flask_lastuser import signal_user_session_refreshed
 
 from .. import app, lastuser
 from ..models import UserActiveAt, db

pyproject.toml

@@ -35,7 +35,7 @@ use_parentheses = true
 combine_as_imports = true
 split_on_trailing_comma = false
 extra_standard_library = ['typing_extensions']
-known_first_party = ['baseframe', 'coaster']
+known_first_party = ['baseframe', 'coaster', 'flask_lastuser']
 known_repo = ['hasjob']
 default_section = 'THIRDPARTY'
 sections = [