Skip to content
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

Jump to bottom

Fix deprecations #316

Merged
merged 4 commits into from
May 3, 2023
Merged

Fix deprecations #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cecf27f
[fix] DeprecationWarning for import Mapping , Iterable from collectio…
RaoufJabriSAMSA-IT Mar 29, 2023
b5eb8f9
Merge remote-tracking branch 'upstream/master' into HEAD
asherf May 3, 2023
642b8b6
Merge branch 'mpdavis:master' into fix-deprecations
asherf May 3, 2023
fc86405
fmt
asherf May 3, 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
6 changes: 5 additions & 1 deletion jose/jws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import binascii
import json
from collections.abc import Iterable, Mapping

try:
from collections.abc import Iterable, Mapping
except ImportError:
from collections import Mapping, Iterable

from jose import jwk
from jose.backends.base import Key
Expand Down
6 changes: 5 additions & 1 deletion jose/jwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import json
from calendar import timegm
from collections.abc import Mapping

try:
from collections.abc import Mapping
except ImportError:
from collections import Mapping
from datetime import datetime, timedelta

from jose import jws
Expand Down