From 54a63ecf15c3deb934dc36f00bed829b9d071c80 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Mon, 3 Mar 2025 18:07:11 +0100 Subject: [PATCH] chore: drop pkg_resources usage --- paste/util/template.py | 7 ++++--- tests/cgiapp_data/form.cgi | 9 --------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/paste/util/template.py b/paste/util/template.py index ee6b25f..94df3b6 100644 --- a/paste/util/template.py +++ b/paste/util/template.py @@ -682,12 +682,13 @@ def parse_default(tokens, name, context): """ def fill_command(args=None): - import sys, optparse, pkg_resources, os + import sys, optparse, os + from importlib.metadata import distribution if args is None: args = sys.argv[1:] - dist = pkg_resources.get_distribution('Paste') + dist = distribution('Paste') parser = optparse.OptionParser( - version=str(dist), + version=dist.version, usage=_fill_command_usage) parser.add_option( '-o', '--output', diff --git a/tests/cgiapp_data/form.cgi b/tests/cgiapp_data/form.cgi index 21dca13..4005dc3 100755 --- a/tests/cgiapp_data/form.cgi +++ b/tests/cgiapp_data/form.cgi @@ -4,20 +4,11 @@ print('Content-type: text/plain') print('') import sys -import warnings from os.path import dirname base_dir = dirname(dirname(dirname(__file__))) sys.path.insert(0, base_dir) -with warnings.catch_warnings(): - warnings.simplefilter("ignore", category=DeprecationWarning) - try: - import pkg_resources - except ImportError: - # Ignore - pass - from paste.util.field_storage import FieldStorage class FormFieldStorage(FieldStorage):