Skip to content

fix: manage removal of pkg_resources from py3.12 #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: manage removal of pkg_resources from py3.12 #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions razorpay/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import os
import json
import requests
import pkg_resources

from pkg_resources import DistributionNotFound

from types import ModuleType

Expand Down Expand Up @@ -82,12 +79,21 @@ def _update_user_agent_header(self, options):
return options

def _get_version(self):
version = ""
# use pkg_resources or improtlib.metdata based on availability
try:
from pkg_resources import require, DistributionNotFound
get_version = lambda v: require(v)[0].version
NotFoundError = DistributionNotFound
except ModuleNotFoundError:
from importlib.metadata import version, PackageNotFoundError
get_version, NotFoundError = version, PackageNotFoundError

# return version
try: # nosemgrep : gitlab.bandit.B110
version = pkg_resources.require("razorpay")[0].version
except DistributionNotFound: # pragma: no cover
return get_version("razorpay")
except NotFoundError: # pragma: no cover
pass
return version
return ""

def _get_app_details_ua(self):
app_details_ua = ""
Expand Down Expand Up @@ -176,20 +182,20 @@ def put(self, path, data, **options):
data, options = self._update_request(data, options)
return self.request('put', path, data=data, **options)

def file(self, path, data, **options):
def file(self, path, data, **options):
fileDict = {}
fieldDict = {}

if('file' not in data):
# if file is not exists in the dictionary
data['file'] = ""

fileDict['file'] = data['file']
# Create a dict of form fields
fileDict['file'] = data['file']

# Create a dict of form fields
for fields in data:
if(fields != 'file'):
fieldDict[str(fields)] = data[fields]
fieldDict[str(fields)] = data[fields]

return self.request('post', path, files=fileDict, data=fieldDict, **options)

Expand Down