This is an automated email from the ASF dual-hosted git repository. kentontaylor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit da1cbe557eb49c18e5281bfedb0a6ecf4e2523d5 Author: Dave Brondsema <[email protected]> AuthorDate: Fri Oct 11 11:08:17 2024 -0400 run: find Allura* Forge* fuse/ scripts/ -name '*.py' | xargs pyupgrade --py39-plus --keep-mock && git co scripts/ApacheAccessHandler.py --- Allura/allura/lib/markdown_extensions.py | 2 +- Allura/allura/lib/plugin.py | 2 +- Allura/allura/lib/widgets/form_fields.py | 20 ++++++++++---------- Allura/allura/model/artifact.py | 22 +++++++++++----------- Allura/allura/model/auth.py | 6 +++--- Allura/allura/model/discuss.py | 10 +++++----- Allura/allura/model/project.py | 2 +- Allura/allura/tests/functional/test_auth.py | 4 ++-- Allura/allura/tests/functional/test_site_admin.py | 4 ++-- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py index 3e63e16f1..a942e8ba4 100644 --- a/Allura/allura/lib/markdown_extensions.py +++ b/Allura/allura/lib/markdown_extensions.py @@ -60,7 +60,7 @@ FORGE_LINK_RE = markdown.inlinepatterns.NOIMG + BRK + \ r'''\(\s*(<.*?>|((?:(?:\(.*?\))|[^\(\)]))*?)\s*((['"])(.*?)\12\s*)?\)''' -def clear_markdown_registry(reg: markdown.util.Registry, keep: List[str] = []): +def clear_markdown_registry(reg: markdown.util.Registry, keep: list[str] = []): keep_items = {} for name in keep: keep_items[name] = reg[name] diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py index 85076c6ce..c836378a6 100644 --- a/Allura/allura/lib/plugin.py +++ b/Allura/allura/lib/plugin.py @@ -1883,7 +1883,7 @@ class AdminExtension: project_admin_controllers = {} - def update_project_sidebar_menu(self, sidebar_links: list['SitemapEntry']) -> list['SitemapEntry']: + def update_project_sidebar_menu(self, sidebar_links: list[SitemapEntry]) -> list[SitemapEntry]: """ Implement this function to modify the project sidebar. Check `c.project` if you want to limit when this displays diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py index 0a510d551..d2347daca 100644 --- a/Allura/allura/lib/widgets/form_fields.py +++ b/Allura/allura/lib/widgets/form_fields.py @@ -380,10 +380,10 @@ class JQueryMixin: k: getattr(self, k) for k in self.js_params} yield onready(''' -$(document).on('clone', function () { - $('.%s').%s(%s); }); +$(document).on('clone', function () {{ + $('.{}').{}({}); }}); $(document).trigger('clone'); - ''' % (self.container_cls, self.js_widget_name, json.dumps(opts))) + '''.format(self.container_cls, self.js_widget_name, json.dumps(opts))) class SortableRepeatedMixin(JQueryMixin): @@ -503,16 +503,16 @@ class Lightbox(ew_core.Widget): def resources(self): yield ew.JSLink('js/jquery.lightbox_me.js') yield onready(''' - var $lightbox = $('#lightbox_%s'); - $('body').on('click', '%s', function(e) { + var $lightbox = $('#lightbox_{}'); + $('body').on('click', '{}', function(e) {{ e.preventDefault(); - $lightbox.lightbox_me(%s); - }); - $lightbox.on('click', '.close', function(e) { + $lightbox.lightbox_me({}); + }}); + $lightbox.on('click', '.close', function(e) {{ e.preventDefault(); $lightbox.trigger('close'); - }); - ''' % (self.name, self.trigger, self.options)) + }}); + '''.format(self.name, self.trigger, self.options)) class DisplayOnlyField(ew.HiddenField): diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py index efb345739..0758a9569 100644 --- a/Allura/allura/model/artifact.py +++ b/Allura/allura/model/artifact.py @@ -87,7 +87,7 @@ class Artifact(MappedClass, SearchIndexable): if c.project and not skip_last_updated: c.project.last_updated = datetime.utcnow() - query: 'Query[Artifact]' + query: Query[Artifact] type_s = 'Generic Artifact' @@ -548,7 +548,7 @@ class Snapshot(Artifact): 'author.id', ] - query: 'Query[Snapshot]' + query: Query[Snapshot] _id = FieldProperty(S.ObjectId) artifact_id = FieldProperty(S.ObjectId) @@ -623,7 +623,7 @@ class VersionedArtifact(Artifact): name = 'versioned_artifact' history_class = Snapshot - query: 'Query[VersionedArtifact]' + query: Query[VersionedArtifact] version = FieldProperty(S.Int, if_missing=0) @@ -743,7 +743,7 @@ class Message(Artifact): session = artifact_orm_session name = 'message' - query: 'Query[Message]' + query: Query[Message] type_s = 'Generic Message' @@ -794,7 +794,7 @@ class AwardFile(File): session = main_orm_session name = 'award_file' - query: 'Query[AwardFile]' + query: Query[AwardFile] award_id = FieldProperty(S.ObjectId) @@ -806,7 +806,7 @@ class Award(Artifact): name = 'award' indexes = ['short'] - query: 'Query[Award]' + query: Query[Award] type_s = 'Generic Award' @@ -852,7 +852,7 @@ class AwardGrant(Artifact): name = 'grant' indexes = ['short'] - query: 'Query[AwardGrant]' + query: Query[AwardGrant] type_s = 'Generic Award Grant' @@ -941,7 +941,7 @@ class Feed(MappedClass): ('pubdate', pymongo.DESCENDING)), ] - query: 'Query[Feed]' + query: Query[Feed] _id = FieldProperty(S.ObjectId) ref_id: str = ForeignIdProperty('ArtifactReference') @@ -1068,7 +1068,7 @@ class VotableArtifact(MappedClass): session = main_orm_session name = 'vote' - query: 'Query[VotableArtifact]' + query: Query[VotableArtifact] votes = FieldProperty(int, if_missing=0) votes_up = FieldProperty(int, if_missing=0) @@ -1198,7 +1198,7 @@ class MovedArtifact(Artifact): session = artifact_orm_session name = 'moved_artifact' - query: 'Query[MovedArtifact]' + query: Query[MovedArtifact] _id = FieldProperty(S.ObjectId) app_config_id = ForeignIdProperty( @@ -1216,7 +1216,7 @@ class SpamCheckResult(MappedClass): ('user_id', 'result'), ] - query: 'Query[SpamCheckResult]' + query: Query[SpamCheckResult] _id = FieldProperty(S.ObjectId) ref_id: str = ForeignIdProperty('ArtifactReference') diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py index 8ff2df58d..607a4b5cb 100644 --- a/Allura/allura/model/auth.py +++ b/Allura/allura/model/auth.py @@ -172,11 +172,11 @@ class EmailAddress(MappedClass): self.set_nonce_hash() log.info('Sending verification link to %s', self.email) text = ''' -To verify the email address %s belongs to the user %s, +To verify the email address {} belongs to the user {}, please visit the following URL: -%s -''' % (self.email, +{} +'''.format(self.email, self.claimed_by_user(include_pending=True).username, h.absurl(f'/auth/verify_addr?a={h.urlquote(self.nonce)}'), ) diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py index 92999e295..2199ecdd4 100644 --- a/Allura/allura/model/discuss.py +++ b/Allura/allura/model/discuss.py @@ -57,7 +57,7 @@ class Discussion(Artifact, ActivityObject): class __mongometa__: name = 'discussion' - query: 'Query[Discussion]' + query: Query[Discussion] type_s = 'Discussion' @@ -168,7 +168,7 @@ class Thread(Artifact, ActivityObject): ('discussion_id',), ] - query: 'Query[Thread]' + query: Query[Thread] type_s = 'Thread' @@ -492,7 +492,7 @@ class PostHistory(Snapshot): class __mongometa__: name = 'post_history' - query: 'Query[PostHistory]' + query: Query[PostHistory] artifact_id = ForeignIdProperty('Post') @@ -540,7 +540,7 @@ class Post(Message, VersionedArtifact, ActivityObject, ReactableArtifact): ('deleted', 'discussion_id', 'thread_id', 'full_slug'), ] - query: 'Query[Post]' + query: Query[Post] type_s = 'Post' @@ -862,7 +862,7 @@ class DiscussionAttachment(BaseAttachment): polymorphic_identity = 'DiscussionAttachment' indexes = ['filename', 'discussion_id', 'thread_id', 'post_id'] - query: 'Query[DiscussionAttachment]' + query: Query[DiscussionAttachment] discussion_id = FieldProperty(schema.ObjectId) thread_id = FieldProperty(str) diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py index d7e65b8c2..23726135c 100644 --- a/Allura/allura/model/project.py +++ b/Allura/allura/model/project.py @@ -1444,7 +1444,7 @@ class AppConfig(MappedClass, ActivityObject): '''ACL processing should terminate at the AppConfig''' return None - def load(self) -> typing.Type[Application]: + def load(self) -> type[Application]: """ :returns: the related :class:`Application <allura.app.Application>` class """ diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py index e9e8fd898..d862c7a8e 100644 --- a/Allura/allura/tests/functional/test_auth.py +++ b/Allura/allura/tests/functional/test_auth.py @@ -1725,9 +1725,9 @@ class TestPasswordReset(TestController): # confirm email sent text = '''Your username is test-admin -To update your password on %s, please visit the following URL: +To update your password on {}, please visit the following URL: -%s/auth/forgotten_password/%s''' % (config['site_name'], config['base_url'], hash) +{}/auth/forgotten_password/{}'''.format(config['site_name'], config['base_url'], hash) sendsimplemail.post.assert_called_once_with( sender='noreply@localhost', toaddr=email.email, diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py index c38816b46..7a017f7af 100644 --- a/Allura/allura/tests/functional/test_site_admin.py +++ b/Allura/allura/tests/functional/test_site_admin.py @@ -720,9 +720,9 @@ class TestUserDetails(TestController): hash = user.get_tool_data('AuthPasswordReset', 'hash') text = '''Your username is test-user -To update your password on %s, please visit the following URL: +To update your password on {}, please visit the following URL: -%s/auth/forgotten_password/%s''' % (config['site_name'], config['base_url'], hash) +{}/auth/forgotten_password/{}'''.format(config['site_name'], config['base_url'], hash) sendmail.post.assert_called_once_with( sender='noreply@localhost', toaddr='[email protected]',
