Merge branch 'main' into py3

Author: ewdurbin

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Lint
+
+on: [push, pull_request, workflow_dispatch]
+
+permissions: {}
+
+env:
+  FORCE_COLOR: 1
+  RUFF_OUTPUT_FORMAT: github
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - uses: tox-dev/action-pre-commit-uv@v1

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+repos:
+  - repo: local
+    hooks:
+      - id: sort-ini
+        name: Sort config.ini
+        entry: python3 config/sort-ini.py config/config.ini
+        language: python
+        pass_filenames: false
+        files: ^config/config.ini$

config/config.ini

@@ -36,6 +36,9 @@ name = Abu Ashraf Masnun
 [http://techarttiki.blogspot.com/feeds/posts/default/-/python]
 name = Adam Pletcher
 
+[https://blog.adarshd.dev/feed.xml]
+name = Adrarsh Divakaran
+
 [http://agendaless.com/blog/index.atom?category=python]
 name = Agendaless Consulting
 
@@ -69,7 +72,7 @@ name = Alexey Evseev
 [http://akaptur.github.io/blog/categories/python/atom.xml]
 name = Allison Kaptur
 
-[http://blog.amjith.com/posts.atom?tag=python]
+[https://amjith.com/tags/python/index.xml]
 name = Amjith Ramanujam
 
 [http://blog.amvtek.com/feeds/tags/python.atom.xml]
@@ -114,6 +117,9 @@ name = Anton Bobrov
 [https://anweshadas.in/tag/python/rss/]
 name = Anwesha Das
 
+[https://arilamstein.com/tag/Python/feed/]
+name = Ari Lamstein
+
 [http://lucumr.pocoo.org/feed.atom]
 name = Armin Ronacher
 
@@ -258,6 +264,9 @@ name = Christian Ledermann
 [http://feeds.feedburner.com/mrtopf-python]
 name = Christian Scholz
 
+[https://bugfactory.io/articles-on-python/feed.xml]
+name = Christoph Schiessl
+
 [https://cito.github.io/tags/python/index.xml]
 name = Christoph Zwerschke
 
@@ -318,7 +327,7 @@ name = Daniel Bader
 [http://danielnouri.org/notes/category/python/feed/index.xml]
 name = Daniel Nouri
 
-[https://daniel.roygreenfeld.com/feeds/python.atom.xml]
+[https://daniel.feldroy.com/feeds/python.atom.xml]
 name = Daniel Roy Greenfeld
 
 [http://www.datacommunitydc.org/blog?format=RSS&tag=python]
@@ -507,7 +516,7 @@ name = Greg Taylor
 [http://agiletesting.blogspot.com/feeds/posts/default/-/python]
 name = Grig Gheorghiu
 
-[http://blog.fizyk.net.pl/tags/python.xml]
+[https://fizyk.dev/tags/python.xml]
 name = Grzegorz Śliwiński
 
 [http://neopythonic.blogspot.com/feeds/posts/default]
@@ -537,7 +546,7 @@ name = Holger Peters
 [https://blog.holoviz.org/index.xml]
 name = HoloViz
 
-[https://dev.to/feed/hugovk]
+[https://hugovk.dev/tags/python/index.xml]
 name = Hugo van Kemenade
 
 [https://humberto.io/tags/python/index.xml]
@@ -792,7 +801,7 @@ name = Malthe Borch
 [https://www.marc-richter.info/category/python/planet-python-articles/feed/]
 name = Marc Richter
 
-[http://www.malemburg.com/rss]
+[https://www.malemburg.com/rss]
 name = Marc-André Lemburg
 
 [http://www.grulic.org.ar/~mdione/glob/categories/python.xml]
@@ -861,6 +870,9 @@ name = Michael Foord
 [http://mjtokelly.blogspot.com/feeds/posts/default/-/Python]
 name = "Michael J.T. O'Kelly"
 
+[https://mkennedy.codes/tags/python/index.xml]
+name = "Michael Kennedy's Thoughts on Technology"
+
 [http://micknelson.wordpress.com/category/python/feed/atom/]
 name = Michael Nelson
 
@@ -1083,9 +1095,6 @@ name = PyCoder’s Weekly
 [http://feeds.feedburner.com/PyCon]
 name = PyCon
 
-[https://www.pygame.org/news/feed/atom]
-name = pygame
-
 [https://pypodcats.live/episodes/index.xml]
 name = PyPodcats
 
@@ -1368,6 +1377,9 @@ name = Stefan Behnel
 [http://stefan.sofa-rockers.org/feeds/python]
 name = Stefan Scherfke
 
+[https://stefaniemolin.com/feeds/Python-atom.xml]
+name = Stefanie Molin
+
 [http://www.jodal.no/atom-python.xml]
 name = Stein Magnus Jodal
 
@@ -1395,6 +1407,9 @@ name = Suresh Dasari/Tutlane.com
 [https://ict.swisscom.ch/feed/?post_type=cubetech_post&cubetech_keyword=Python]
 name = Swisscom ICT
 
+[https://talkpython.fm/blog/posts/index.xml]
+name = Talk Python Blog
+
 [https://talkpython.fm/episodes/rss]
 name = Talk Python to Me
 
@@ -1443,9 +1458,15 @@ name = The Parcon Blog
 [https://thepythoncodingbook.com/feed/]
 name = The Python Coding Blog
 
+[https://www.thepythoncodingstack.com/feed]
+name = The Python Coding Stack
+
 [http://pythonpapers.blogspot.com/atom.xml]
 name = The Python Papers
 
+[https://www.pythonshow.com/feed]
+name = The Python Show
+
 [https://threeofwands.com/tag/python/rss/]
 name = The Three of Wands
 
@@ -1614,7 +1635,7 @@ name = codeboje
 [https://death.andgravity.com/_feed/index/_tags/python.xml]
 name = death and gravity
 
-[http://www.egenix.com/company/news/rss2]
+[https://www.egenix.com/company/news/rss2]
 name = eGenix.com
 
 [http://hypothesis.works/articles/python/feed/]
@@ -1635,6 +1656,9 @@ name = pgcli
 [https://py.checkio.org/blog/special-rss/]
 name = py.CheckIO
 
+[https://www.pygame.org/news/feed/atom]
+name = pygame
+
 [http://www.pythonwise.blogspot.com/feeds/posts/default/-/python]
 name = pythonwise
 
@@ -1659,11 +1683,3 @@ name = Éric Araujo
 [https://lukasz.langa.pl/python/atom.xml]
 name = Łukasz Langa
 
-[https://www.pythonshow.com/feed]
-name = The Python Show
-
-[https://stefaniemolin.com/feeds/Python-atom.xml]
-name = Stefanie Molin
-
-[https://bugfactory.io/articles-on-python/feed.xml]
-name = Christoph Schiessl

config/index.html.tmpl

@@ -83,7 +83,7 @@
               <li><a href="http://terri.toybox.ca/python-soc/">Python Summer of Code</a></li>
               <li><a href="http://www.afpy.org/planet/">Planet Python Francophone</a></li>
               <li><a href="http://planeta.python.org.ar/">Planet Python Argentina</a></li>
-              <li><a href="http://wiki.python.org.br/planet/">Planet Python Brasil</a></li>
+              <li><a href="http://planet.python.org.br/">Planet Python Brasil</a></li>
               <li><a href="http://pl.python.org/planeta/">Planet Python Poland</a></li>
   	  </ul></li>
 	  <li>Python Libraries

config/sort-ini.py

@@ -14,7 +14,7 @@
 # This part will destroy the configuration if there's a crash while
 # writing the output.  We're in an GIT-controlled directory, so
 # I didn't care enough to fix this.
-with open(filename, "wb") as fd:
+with open(filename, 'w', encoding='utf-8') as fd:
     # Copy of write() code that sorts output by section
     if oconfig._defaults:
         fd.write("[%s]\n" % DEFAULTSECT)

config/titles_only.html.tmpl

@@ -67,7 +67,7 @@
               <li><a href="http://terri.toybox.ca/python-soc/">Python Summer of Code</a></li>
               <li><a href="http://www.afpy.org/planet/">Planet Python Francophone</a></li>
               <li><a href="http://planeta.python.org.ar/">Planet Python Argentina</a></li>
-              <li><a href="http://wiki.python.org.br/planet/">Planet Python Brasil</a></li>
+              <li><a href="http://planet.python.org.br/">Planet Python Brasil</a></li>
               <li><a href="http://pl.python.org/planeta/">Planet Python Poland</a></li>
   	  </ul></li>
 	  <li>Python Libraries