Migrate from pkg_resources to importlib.metadata and importlib.resources

Author: jelmer

docs/conf.py

@@ -15,7 +15,6 @@
 import sys
 import io
 import re
-import pkg_resources
 
 from os.path import dirname, join
 # Make `_theme` custom sphinx theme available

isso/__init__.py

@@ -25,8 +25,8 @@
 #
 # Isso – a lightweight Disqus alternative
 
-import pkg_resources
-dist = pkg_resources.get_distribution("isso")
+from importlib.metadata import version
+__version__ = version("isso")
 
 # check if exectuable is `isso` and gevent is available
 import sys
@@ -232,7 +232,7 @@ def main():
     subparser = parser.add_subparsers(help="commands", dest="command")
 
     parser.add_argument('--version', action='version',
-                        version='%(prog)s ' + dist.version)
+                        version='%(prog)s ' + __version__)
     parser.add_argument("-c", dest="conf", default="/etc/isso.cfg",
                         metavar="/etc/isso.cfg", help="set configuration file")
 

isso/config.py

@@ -3,15 +3,15 @@
 import datetime
 import logging
 import os
-import pkg_resources
 import re
 
 from email.utils import parseaddr, formataddr
 from configparser import ConfigParser, NoOptionError, NoSectionError, DuplicateSectionError
+from importlib.resources import files
 
 logger = logging.getLogger("isso")
 
-default_config_file = pkg_resources.resource_filename('isso', 'isso.cfg')
+default_config_file = str(files('isso').joinpath('isso.cfg'))
 
 
 def timedelta(string):

isso/utils/http.py

@@ -6,7 +6,7 @@
 
 from urllib.parse import urlparse
 
-from isso import dist
+from isso import __version__
 from isso.wsgi import urlsplit
 
 MAX_RETRY_COUNT = 3
@@ -24,7 +24,7 @@ class curl(object):
     """
 
     headers = {
-        "User-Agent": "Isso/{0} (+https://isso-comments.de)".format(dist.version)
+        "User-Agent": "Isso/{0} (+https://isso-comments.de)".format(__version__)
     }
 
     def __init__(self, method, host, path, timeout=3):

isso/views/__init__.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-import pkg_resources
-dist = pkg_resources.get_distribution("isso")
+from importlib.metadata import version
+__version__ = version("isso")
 
 import json
 
@@ -81,7 +81,7 @@ def __init__(self, isso):
     def show(self, environ, request):
 
         rv = {
-            "version": dist.version,
+            "version": __version__,
             "host": str(local("host")),
             "origin": str(local("origin")),
             "moderation": self.moderation,

isso/views/comments.py

@@ -5,9 +5,9 @@
 import time
 import functools
 import json  # json.dumps to put URL in <script>
-import pkg_resources
 
 from configparser import NoOptionError
+from importlib.resources import files
 from datetime import datetime, timedelta
 from html import escape
 from io import BytesIO as StringIO
@@ -1416,7 +1416,7 @@ def config(self, environment, request):
         </body>
     """
     def demo(self, env, req):
-        index = pkg_resources.resource_filename('isso', 'demo/index.html')
+        index = str(files('isso').joinpath('demo/index.html'))
         return send_from_directory(os_path.dirname(index), 'index.html', env)
 
     """