Skip to content

Commit aacfde8

Browse files
committed
chore: fix linter issues with most recent pylint (unicode related)
1 parent a3eeebe commit aacfde8

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

ibm_cloud_sdk_core/token_managers/container_token_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def retrieve_cr_token(self) -> str:
114114
cr_token_filename)
115115

116116
try:
117-
with open(cr_token_filename, 'r') as file:
117+
with open(cr_token_filename, 'r', encoding='utf-8') as file:
118118
cr_token = file.read()
119119
return cr_token
120120
# pylint: disable=broad-except

ibm_cloud_sdk_core/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def __read_from_credential_file(service_name: str,
314314
config = {}
315315
if credential_file_path is not None:
316316
try:
317-
with open(credential_file_path, 'r') as fobj:
317+
with open(credential_file_path, 'r', encoding='utf-8') as fobj:
318318
for line in fobj:
319319
key_val = line.strip().split(separator, 1)
320320
if len(key_val) == 2:

test/test_base_service.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def test_url_encoding():
134134
path0 = ' \"<>^`{}|/\\?#%[]'
135135
path0_encoded = '%20%22%3C%3E%5E%60%7B%7D%7C%2F%5C%3F%23%25%5B%5D'
136136
# All non-ASCII chars _must_ be encoded in path segments
137-
path1 = u'比萨浇头'.encode('utf8') # "pizza toppings"
137+
path1 = '比萨浇头'.encode('utf8') # "pizza toppings"
138138
path1_encoded = '%E6%AF%94%E8%90%A8%E6%B5%87%E5%A4%B4'
139139

140140
path_encoded = '/v1/foo/' + path0_encoded + '/bar/' + path1_encoded + '/baz'
@@ -741,7 +741,7 @@ def test_files_dict():
741741
form_data = {}
742742
with open(
743743
os.path.join(
744-
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r') as file:
744+
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r', encoding='utf-8') as file:
745745
form_data['file1'] = (None, file, 'application/octet-stream')
746746
form_data['string1'] = (None, 'hello', 'text/plain')
747747
request = service.prepare_request(
@@ -762,7 +762,7 @@ def test_files_list():
762762
form_data = []
763763
with open(
764764
os.path.join(
765-
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r') as file:
765+
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r', encoding='utf-8') as file:
766766
form_data.append(('file1', (None, file, 'application/octet-stream')))
767767
form_data.append(('string1', (None, 'hello', 'text/plain')))
768768
request = service.prepare_request(
@@ -783,17 +783,17 @@ def test_files_duplicate_parts():
783783
form_data = []
784784
with open(
785785
os.path.join(
786-
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r') as file:
786+
os.path.dirname(__file__), '../resources/ibm-credentials-iam.env'), 'r', encoding='utf-8') as file:
787787
form_data.append(
788788
('creds_file', (None, file, 'application/octet-stream')))
789789
with open(
790790
os.path.join(
791-
os.path.dirname(__file__), '../resources/ibm-credentials-basic.env'), 'r') as file:
791+
os.path.dirname(__file__), '../resources/ibm-credentials-basic.env'), 'r', encoding='utf-8') as file:
792792
form_data.append(
793793
('creds_file', (None, file, 'application/octet-stream')))
794794
with open(
795795
os.path.join(
796-
os.path.dirname(__file__), '../resources/ibm-credentials-bearer.env'), 'r') as file:
796+
os.path.dirname(__file__), '../resources/ibm-credentials-bearer.env'), 'r', encoding='utf-8') as file:
797797
form_data.append(
798798
('creds_file', (None, file, 'application/octet-stream')))
799799
request = service.prepare_request(

test/test_detailed_response.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_detailed_response_dict():
2626
status_code=mock_response.status_code)
2727
assert detailed_response is not None
2828
assert detailed_response.get_result() == {'foobar': 'baz'}
29-
assert detailed_response.get_headers() == {u'Content-Type': 'application/json'}
29+
assert detailed_response.get_headers() == {'Content-Type': 'application/json'}
3030
assert detailed_response.get_status_code() == 200
3131

3232
response_str = clean(detailed_response.__str__())
@@ -48,7 +48,7 @@ def test_detailed_response_list():
4848
status_code=mock_response.status_code)
4949
assert detailed_response is not None
5050
assert detailed_response.get_result() == ['foobar', 'baz']
51-
assert detailed_response.get_headers() == {u'Content-Type': 'application/json'}
51+
assert detailed_response.get_headers() == {'Content-Type': 'application/json'}
5252
assert detailed_response.get_status_code() == 200
5353

5454
response_str = clean(detailed_response.__str__())

0 commit comments

Comments
 (0)