Skip to content

removed couple deprecations #263

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

Merged
chieto-arista merged 2 commits into from
Jun 5, 2023
Merged

removed couple deprecations #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2cc790
removed couple deprecations
Jun 2, 2023
7af714b
removed one more deprecation
Jun 2, 2023
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
12 changes: 5 additions & 7 deletions pyeapi/eapilib.py
View file
Open in desktop
Copy link
Contributor

@chieto-arista chieto-arista Jun 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,8 @@ def send(self, data):
raise ConnectionError(str(self), '%s. %s' % (response.reason,
response_content))

# Work around for Python 2.7/3.x compatibility
if not type(response_content) == str:
# For Python 3.x - decode bytes into string
response_content = response_content.decode()
# Python 3.7 json.loads() works with bytes or strings,
# thus no decoding is required
decoded = json.loads(response_content)
_LOGGER.debug('eapi_response: %s' % decoded)

Expand All @@ -462,8 +460,8 @@ def send(self, data):

return decoded

# socket.error is deprecated in python 3 and replaced with OSError.
except (socket.error, OSError) as exc:
# removed socket.error as it's deprecated in python 3
except OSError as exc:
_LOGGER.exception(exc)
self.socket_error = exc
self.error = exc
Expand Down Expand Up @@ -726,7 +724,7 @@ def authentication(self, username, password):
session = SimpleCookie(resp.getheader("Set-Cookie"))
self._auth = ("Cookie", session.output(header="", attrs=[]))

except (socket.error, OSError) as exc:
except OSError as exc:
_LOGGER.exception(exc)
self.socket_error = exc
self.error = exc
Expand Down
2 changes: 1 addition & 1 deletion pyeapi/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def make_iterable(value):
iterable in the form of a list.

Args:
value (object): An valid Python object
value (object): A valid Python object

Returns:
An iterable object of type list
Expand Down