Skip to content
This repository was archived by the owner on Oct 17, 2023. It is now read-only.

Commit cfafdc3

Browse files
martinytodorovmartinytodorov
authored
Merge pull request #71 from neillom/python3
Various Python 3 Changes
2 parents cb1af6b + cdff47e commit cfafdc3

15 files changed

+126
-126
lines changed

‎hellosign_sdk/hsclient.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,7 @@ def _send_signature_request(self, test_mode=False, client_id=None, files=None,
19721972
custom_fields_payload = HSFormat.format_custom_fields(custom_fields)
19731973

19741974
# Form fields per document
1975-
if type(form_fields_per_document) is str:
1975+
if isinstance(form_fields_per_document, str):
19761976
form_fields_payload = form_fields_per_document
19771977
else:
19781978
form_fields_payload = HSFormat.format_json_data(form_fields_per_document)
@@ -2239,7 +2239,7 @@ def _create_unclaimed_draft(self, test_mode=False, client_id=None,
22392239
custom_fields_payload = HSFormat.format_custom_fields(custom_fields)
22402240

22412241
# Form fields per document
2242-
if type(form_fields_per_document) is str:
2242+
if isinstance(form_fields_per_document, str):
22432243
form_fields_payload = form_fields_per_document
22442244
else:
22452245
form_fields_payload = HSFormat.format_json_data(form_fields_per_document)

‎hellosign_sdk/resource/resource_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __init__(self, item_cls, data):
4949
super(ResourceList, self).__init__()
5050
if data is not None:
5151

52-
data = json.loads(data) if type(data) is not dict else data
52+
data = json.loads(data) if not isinstance(data, dict) else data
5353
paging = data['list_info']
5454
raw_items = data.get(self.items_keys[item_cls.__name__])
5555

‎hellosign_sdk/tests/functional_tests/base_test_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def setUp(self):
5252
print(" = personal account as they perform destructive actions. =")
5353
print(" ==================================================================")
5454
while True:
55-
resp = raw_input(' > Continue (type yes or hit Ctrl+C to exit)?')
55+
resp = input(' > Continue (type yes or hit Ctrl+C to exit)?')
5656
if resp == 'yes':
5757
# Continue to tests
5858
break
@@ -63,6 +63,6 @@ def setUp(self):
6363
else:
6464
# Ask question again
6565
pass
66-
print
66+
print()
6767

68-
print
68+
print()

‎hellosign_sdk/tests/functional_tests/test_account.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ def test_create_account(self):
5151

5252
email = "py-sdk-test-%[email protected]" % time()
5353
result = self.client.create_account(email)
54-
self.assertEquals(isinstance(result, Account), True)
54+
self.assertEqual(isinstance(result, Account), True)
5555

5656
# Should work too if giving a password, even though it's not used
5757
email = "py-sdk-test-%[email protected]" % time()
5858
result = self.client.create_account(email, "something")
59-
self.assertEquals(isinstance(result, Account), True)
59+
self.assertEqual(isinstance(result, Account), True)
6060

6161
except HSException as e:
6262
self.fail(e.message)
@@ -73,7 +73,7 @@ def test_create_account(self):
7373
try:
7474
acct = self.client.create_account(email, client_id=self.client_id, client_secret=self.client_secret)
7575
self.assertTrue(acct is not None)
76-
self.assertEquals(acct.email_address, email)
76+
self.assertEqual(acct.email_address, email)
7777
self.assertTrue(hasattr(acct, 'oauth'))
7878
self.assertTrue(acct.oauth is not None)
7979
self.assertTrue(isinstance(acct.oauth, HSAccessTokenAuth))
@@ -86,7 +86,7 @@ def test_get_account_info(self):
8686

8787
# Valid account
8888
result = self.client.get_account_info()
89-
self.assertEquals(isinstance(result, Account), True)
89+
self.assertEqual(isinstance(result, Account), True)
9090

9191
# Account does not exist
9292
try:
@@ -101,7 +101,7 @@ def test_update_account_info(self):
101101

102102
# We update nothing, but the api returns an Account object, so it is considered successful
103103
result = self.client.get_account_info()
104-
self.assertEquals(isinstance(result, Account), True)
104+
self.assertEqual(isinstance(result, Account), True)
105105

106106
# Invalid callback url
107107
try:
@@ -115,8 +115,8 @@ def test_update_account_info(self):
115115
new_callback_url = 'http://www.example.com/mycallback'
116116
self.client.account.callback_url = new_callback_url
117117
result = self.client.update_account_info()
118-
self.assertEquals(isinstance(result, Account), True)
119-
self.assertEquals(result.callback_url, new_callback_url)
118+
self.assertEqual(isinstance(result, Account), True)
119+
self.assertEqual(result.callback_url, new_callback_url)
120120

121121
def test_account_verify(self):
122122
''' Test verifying the existence of a given account '''

‎hellosign_sdk/tests/functional_tests/test_embedded.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_embedded_signing(self):
5050
signers=signers,
5151
cc_email_addresses=cc_email_addresses)
5252
self.assertTrue(isinstance(emb_sig_req, SignatureRequest))
53-
self.assertEquals(len(emb_sig_req.signatures), 1)
53+
self.assertEqual(len(emb_sig_req.signatures), 1)
5454
except HSException as e:
5555
self.fail(e.message)
5656

@@ -87,7 +87,7 @@ def test_embedded_signing_with_template(self):
8787
allow_decline=True)
8888

8989
self.assertTrue(isinstance(emb_sig_req, SignatureRequest))
90-
self.assertEquals(len(emb_sig_req.signatures), 1)
90+
self.assertEqual(len(emb_sig_req.signatures), 1)
9191
except HSException as e:
9292
self.fail(e.message)
9393

‎hellosign_sdk/tests/functional_tests/test_requests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def _check_warnings(self, warnings):
4848
self.assertIs(len(warnings), 1)
4949
self.assertIsInstance(warnings[0], dict)
5050
self.assertIsNotNone(warnings[0].get('warning_name'))
51-
self.assertEquals(warnings[0]['warning_name'], self.TEST_WARNING_NAME)
51+
self.assertEqual(warnings[0]['warning_name'], self.TEST_WARNING_NAME)
5252
self.assertIsNotNone(warnings[0].get('warning_msg'))
53-
self.assertEquals(warnings[0]['warning_msg'], self.TEST_WARNING_MSG)
53+
self.assertEqual(warnings[0]['warning_msg'], self.TEST_WARNING_MSG)
5454

5555
def test_warnings(self):
5656
''' Test warning accessibility '''
@@ -81,16 +81,16 @@ def test_user_agent(self):
8181
self.assertIsNotNone(req_headers)
8282
self.assertIsInstance(req_headers, dict)
8383
self.assertIsNotNone(req_headers.get('User-Agent'))
84-
self.assertEquals(req_headers['User-Agent'], HSRequest._get_user_agent())
84+
self.assertEqual(req_headers['User-Agent'], HSRequest._get_user_agent())
8585

8686
parts = req_headers['User-Agent'].split('/')
8787
self.assertIs(len(parts), 2)
88-
self.assertEquals(parts[0], 'hellosign-python-sdk')
88+
self.assertEqual(parts[0], 'hellosign-python-sdk')
8989
parts = parts[1].split('.')
9090
self.assertIs(len(parts), 3)
9191
try:
9292
int(parts[0])
9393
int(parts[1])
9494
except ValueError:
9595
self.fail('Invalid version number')
96-
self.assertEquals(parts[2], '5')
96+
self.assertEqual(parts[2], '5')

‎hellosign_sdk/tests/functional_tests/test_signature_request.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ def _send_test_signature_request(self, embedded=False, use_text_tags=False, use_
125125
metadata=metadata,
126126
allow_decline=True)
127127

128-
self.assertEquals(isinstance(sig_req, SignatureRequest), True)
129-
self.assertEquals(sig_req.title, title)
130-
self.assertEquals(sig_req.subject, subject)
131-
self.assertEquals(sig_req.message, message)
132-
self.assertEquals(len(sig_req.signatures), 1)
133-
self.assertEquals(len(sig_req.cc_email_addresses), 0 if use_template or use_multi_templates else 2)
134-
self.assertEquals(sig_req.metadata is not None, True)
135-
self.assertEquals(len(sig_req.metadata), len(metadata))
128+
self.assertEqual(isinstance(sig_req, SignatureRequest), True)
129+
self.assertEqual(sig_req.title, title)
130+
self.assertEqual(sig_req.subject, subject)
131+
self.assertEqual(sig_req.message, message)
132+
self.assertEqual(len(sig_req.signatures), 1)
133+
self.assertEqual(len(sig_req.cc_email_addresses), 0 if use_template or use_multi_templates else 2)
134+
self.assertEqual(sig_req.metadata is not None, True)
135+
self.assertEqual(len(sig_req.metadata), len(metadata))
136136
for (k, v) in metadata.items():
137-
self.assertEquals(sig_req.metadata[k], v)
137+
self.assertEqual(sig_req.metadata[k], v)
138138

139139
return sig_req
140140

@@ -191,7 +191,7 @@ def test_signature_request_reminder(self):
191191
# Sent reminder
192192
try:
193193
result = self.client.remind_signature_request(sig_req.signature_request_id, signer)
194-
self.assertEquals(isinstance(result, SignatureRequest), True)
194+
self.assertEqual(isinstance(result, SignatureRequest), True)
195195
except Forbidden as e:
196196
self.fail(e.message)
197197

@@ -340,27 +340,27 @@ def test_signature_request_helpers(self):
340340
sig_req = SignatureRequest(sig_req_data)
341341

342342
comps = sig_req.find_response_component(api_id=comp1['api_id'])
343-
self.assertEquals(len(comps), 1)
344-
self.assertEquals(comps[0], comp1)
343+
self.assertEqual(len(comps), 1)
344+
self.assertEqual(comps[0], comp1)
345345

346346
comps = sig_req.find_response_component(signature_id=comp1['signature_id'])
347-
self.assertEquals(len(comps), 3)
348-
self.assertEquals(comps[0], comp1)
349-
self.assertEquals(comps[1], comp2)
350-
self.assertEquals(comps[2], comp3)
347+
self.assertEqual(len(comps), 3)
348+
self.assertEqual(comps[0], comp1)
349+
self.assertEqual(comps[1], comp2)
350+
self.assertEqual(comps[2], comp3)
351351

352352
comps = sig_req.find_response_component(api_id='3j2k3j21k32')
353-
self.assertEquals(len(comps), 0)
353+
self.assertEqual(len(comps), 0)
354354

355355
s = sig_req.find_signature(signature_id=sig_data['signature_id'])
356356
self.assertTrue(s is not None)
357357
self.assertTrue(isinstance(s, Signature), "Expected Signature but got %s" % s.__class__.__name__)
358-
self.assertEquals(s.json_data, sig_data)
358+
self.assertEqual(s.json_data, sig_data)
359359

360360
s = sig_req.find_signature(signer_email_address=sig_data['signer_email_address'])
361361
self.assertTrue(s is not None)
362362
self.assertTrue(isinstance(s, Signature), "Expected Signature but got %s" % s.__class__.__name__)
363-
self.assertEquals(s.json_data, sig_data)
363+
self.assertEqual(s.json_data, sig_data)
364364

365365
s = sig_req.find_signature(signature_id='j32kj32k13j')
366-
self.assertEquals(s, None)
366+
self.assertEqual(s, None)

‎hellosign_sdk/tests/functional_tests/test_team.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_add_team_member(self):
7676
# Valid
7777
result = self.client.add_team_member(email_address="py-sdk-test-%[email protected]" % time())
7878
self.assertTrue(isinstance(result, Team))
79-
#self.assertEquals(len(result.accounts), num_members + 1) Test no longer works
79+
#self.assertEqual(len(result.accounts), num_members + 1) Test no longer works
8080

8181
def test_remove_team_member(self):
8282
''' Test removing a team member '''
@@ -120,7 +120,7 @@ def test_create_team(self):
120120
try:
121121
result = self.client.create_team(team_name)
122122
self.assertTrue(isinstance(result, Team))
123-
self.assertEquals(result.name, team_name)
123+
self.assertEqual(result.name, team_name)
124124
except HSException as e:
125125
self.fail('Could not destroy team: %s' % e.message)
126126

@@ -135,7 +135,7 @@ def test_update_team(self):
135135
new_name = 'New team name'
136136
result = self.client.update_team_name(new_name)
137137
self.assertTrue(isinstance(result, Team))
138-
self.assertEquals(result.name, new_name)
138+
self.assertEqual(result.name, new_name)
139139
except HSException as e:
140140
self.fail(e.message)
141141

‎hellosign_sdk/tests/functional_tests/test_template.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _get_team(self):
4040
except NotFound:
4141
team = self.client.create_team("Team Name")
4242
self.assertTrue(isinstance(team, Team))
43-
self.assertEquals(team.name, "Team Name")
43+
self.assertEqual(team.name, "Team Name")
4444

4545
if len(team.accounts) < 2:
4646
try:
@@ -68,7 +68,7 @@ def test_template_list_and_get(self):
6868
template = self._get_one_template()
6969
result = self.client.get_template(template.template_id)
7070
self.assertTrue(isinstance(result, Template))
71-
self.assertEquals(result.template_id, template.template_id)
71+
self.assertEqual(result.template_id, template.template_id)
7272

7373
def test_add_remove_template_users(self):
7474
''' Test adding and removing users from a template '''
@@ -96,7 +96,7 @@ def test_create_embedded_template_draft(self):
9696
{'name': 'Madame President', 'order': 2},
9797
{'name': 'Lee Adama', 'order': 3},
9898
]
99-
cc_roles = ['Deck Chief','Admiral','Starbuck']
99+
cc_roles = ['Deck Chief', 'Admiral','Starbuck']
100100
merge_fields = [{'name':'mymerge', 'type':'text'}]
101101

102102
response = self.client.create_embedded_template_draft(

‎hellosign_sdk/tests/functional_tests/test_unclaimed_draft.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def test_unclaimed_draft(self):
6868
metadata=metadata,
6969
allow_decline=True)
7070

71-
self.assertEquals(isinstance(result, UnclaimedDraft), True)
71+
self.assertEqual(isinstance(result, UnclaimedDraft), True)
7272

7373
def test_embedded_unclaimed_draft(self):
7474
''' Test creating an embedded unclaimed draft '''
@@ -116,7 +116,7 @@ def test_embedded_unclaimed_draft(self):
116116
cc_email_addresses=cc_email_addresses,
117117
metadata=metadata,
118118
allow_decline=False)
119-
self.assertEquals(isinstance(result, UnclaimedDraft), True)
119+
self.assertEqual(isinstance(result, UnclaimedDraft), True)
120120

121121
def test_create_embedded_unclaimed_draft_with_template(self):
122122
''' Test creating an embedded unclaimed draft from a template '''
@@ -168,7 +168,7 @@ def test_create_embedded_unclaimed_draft_with_template(self):
168168
metadata=metadata,
169169
allow_decline=False)
170170

171-
self.assertEquals(isinstance(returned, UnclaimedDraft), True)
171+
self.assertEqual(isinstance(returned, UnclaimedDraft), True)
172172

173173
def _get_one_template(self, exclude=None):
174174
''' Get one template from the current account '''

‎hellosign_sdk/tests/unit_tests/test_exceptions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ def test_hsexception(self):
4040

4141
def test_no_auth_method(self):
4242
error = NoAuthMethod("No authentication information found")
43-
self.assertEquals(str(error), "No authentication information found")
44-
self.assertEquals(error.type, "NoAuthMethod")
43+
self.assertEqual(str(error), "No authentication information found")
44+
self.assertEqual(error.type, "NoAuthMethod")
4545

4646
def test_http_error(self):
4747
error = BadRequest("Bad Request", 400)
4848
self.assertEquals(str(error), "Bad Request")
49-
self.assertEquals(error.http_code, 400)
50-
self.assertEquals(error.type, "BadRequest")
49+
self.assertEqual(error.http_code, 400)
50+
self.assertEqual(error.type, "BadRequest")

‎hellosign_sdk/tests/unit_tests/test_hsaccesstokenauth.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ def test_init(self):
3535
refresh_token="6a8949c799991e12dac70cb135095680",
3636
expires_in=10000, state="demo"
3737
)
38-
self.assertEquals(auth.access_token, "369c76ae6185f3b7")
39-
self.assertEquals(auth.access_token_type, "Bearer")
40-
self.assertEquals(auth.refresh_token,"6a8949c799991e12dac70cb135095680")
41-
self.assertEquals(auth.expires_in, 10000)
42-
self.assertEquals(auth.state, "demo")
38+
self.assertEqual(auth.access_token, "369c76ae6185f3b7")
39+
self.assertEqual(auth.access_token_type, "Bearer")
40+
self.assertEqual(auth.refresh_token, "6a8949c799991e12dac70cb135095680")
41+
self.assertEqual(auth.expires_in, 10000)
42+
self.assertEqual(auth.state, "demo")
4343

4444
def test_call(self):
4545
auth = HSAccessTokenAuth(access_token="thetoken", access_token_type="thetokentype")
4646
request = HSRequest(auth)
4747
response = request.get(url='http://httpbin.org/headers')
48-
self.assertEquals(response['headers']['Authorization'], 'thetokentype thetoken')
48+
self.assertEqual(response['headers']['Authorization'], 'thetokentype thetoken')

0 commit comments

Comments
 (0)