opendev
/
git-review
Code Issues Proposed changes

Merge "Use importlib.metadata instead of pkg_resources"

This commit is contained in:
Zuul 2024-03-05 00:26:51 +00:00 committed by Gerrit Code Review
parent f6a7b3e8b5 7b823c16e2
commit 52f09eac53
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git_review/cmd.py
View File

@ -32,9 +32,16 @@ from urllib.parse import urlencode
from urllib.parse import urljoin
from urllib.parse import urlparse
import pkg_resources
import requests
try:
import importlib.metadata as importlib_metadata
pkg_resources = None
except ImportError:
# Pre-py38
importlib_metadata = None
import pkg_resources
VERBOSE = False
UPDATE = False
@ -220,9 +227,12 @@ def run_http_exc(klazz, url, **env):
def get_version():
requirement = pkg_resources.Requirement.parse('git-review')
provider = pkg_resources.get_provider(requirement)
return provider.version
if importlib_metadata:
return importlib_metadata.version('git-review')
else:
requirement = pkg_resources.Requirement.parse('git-review')
provider = pkg_resources.get_provider(requirement)
return provider.version
def get_git_version():