Skip to content

Commit 3d95a39

Browse files
authored
Merge pull request #10 from SendSafely/v1.0.3
v1.0.3
2 parents fa8905a + eb6d4ca commit 3d95a39

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

sendsafely/Package.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
import math
33
import os
44
import requests
5-
from cryptography import CryptographyDeprecationWarning
5+
import cryptography
6+
major, minor, patch = [int(x, 10) for x in cryptography.__version__.split('.')]
7+
if major < 41:
8+
from cryptography import CryptographyDeprecationWarning
9+
else:
10+
from cryptography.utils import CryptographyDeprecationWarning
611
from pgpy import PGPMessage
712
from sendsafely.Progress import Progress
813
import warnings

sendsafely/SendSafely.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
import requests
66
import pgpy
7-
from cryptography import CryptographyDeprecationWarning
7+
import cryptography
8+
major, minor, patch = [int(x, 10) for x in cryptography.__version__.split('.')]
9+
if major < 41:
10+
from cryptography import CryptographyDeprecationWarning
11+
else:
12+
from cryptography.utils import CryptographyDeprecationWarning
813
from pgpy import PGPMessage
914
from pgpy.constants import KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
1015
from sendsafely.Package import Package

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[metadata]
2-
long_description = file: README.md
2+
description-file = README.md
33
license_files = LICENSE.txt, NOTICE.txt

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name='sendsafely',
5-
version='1.0.2',
5+
version='1.0.3',
66
packages=['sendsafely'],
77
description='The SendSafely Client API allows programmatic access to SendSafely and provides a layer of abstraction from our REST API, which requires developers to perform several complex tasks in a correct manner.',
88
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)