Skip to content

Commit 4d57f59

Browse files
jsstylosjsstylos
committed
fixing Python 2.6 support
1 parent a827a02 commit 4d57f59

10 files changed

+74
-69
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ To get your service credentials, follow these steps:
3737
1. Copy `username` and `password` from these service credentials.
3838

3939
## Python Version
40-
Tested 👌 (lightly) on: Python from 2.6 to 3.5-dev (development branch)
40+
Tested 👌 (lightly) on: Python from 2.7 to 3.5-dev (development branch).
41+
Python 2.6 is partially supported but generates InsecurePlatformWarnings (and other warnings), which can be ignored.
4142

4243
## Known Issues
4344
There is a known incompatibility with this module with Python versions 3.x with Korean systems.

‎examples/tone_analyzer_v3_beta.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import json
2-
from watson_developer_cloud import ToneAnalyzerV3Beta
3-
4-
5-
tone_analyzer = ToneAnalyzerV3Beta(
6-
username='YOUR SERVICE USERNAME',
7-
password='YOUR SERVICE PASSWORD',
8-
version='2016-02-11')
9-
10-
print(json.dumps(tone_analyzer.tone(text='I am very happy'), indent=2))
1+
import json
2+
from watson_developer_cloud import ToneAnalyzerV3Beta
3+
4+
5+
tone_analyzer = ToneAnalyzerV3Beta(
6+
username='YOUR SERVICE USERNAME',
7+
password='YOUR SERVICE PASSWORD',
8+
version='2016-02-11')
9+
10+
print(json.dumps(tone_analyzer.tone(text='I am very happy'), indent=2))

‎watson_developer_cloud/concept_expansion_v1_beta.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def _format_status(status):
2323
try:
2424
return status_mapping[status['state']]
2525
except ValueError:
26-
return {'status': 'error', 'error': 'invalid json: {}'.format(status)}
26+
return {'status': 'error', 'error': 'invalid json: {0}'.format(status)}
2727
except KeyError:
28-
return {'status': 'error', 'error': 'missing json data: {}'.format(status)}
28+
return {'status': 'error', 'error': 'missing json data: {0}'.format(status)}
2929

3030

3131
class ConceptExpansionV1Beta(WatsonDeveloperCloudService):

‎watson_developer_cloud/concept_insights_v2.py‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ def get_accounts_info(self):
5252
return self.request(method='GET', url='/v2/accounts', accept_json=True)
5353

5454
def get_concept(self, concept_id, graph=WIKIPEDIA_EN_LATEST):
55-
return self.request(method='GET', url='/v2/{}/concepts/{}'.format(graph, concept_id), accept_json=True)
55+
return self.request(method='GET', url='/v2/{0}/concepts/{1}'.format(graph, concept_id), accept_json=True)
5656

5757
def search_concept_by_label(self, label, graph=WIKIPEDIA_EN_LATEST, concept_fields=None):
5858
if isinstance(concept_fields, dict):
5959
concept_fields = json.dumps(concept_fields)
6060
params = {'query': label, 'concept_fields': concept_fields}
61-
return self.request(method='GET', url='/v2/{}/label_search'.format(graph), params=params, accept_json=True)
61+
return self.request(method='GET', url='/v2/{0}/label_search'.format(graph), params=params, accept_json=True)
6262

6363
def get_graphs(self):
6464
return self.request(method='GET', url='/v2/graphs', accept_json=True)
@@ -83,16 +83,16 @@ def get_related_concepts(self, concept_ids, level=1, limit=10, concept_fields=No
8383
'concept_fields': concept_fields,
8484
'level': level,
8585
'limit': limit}
86-
return self.request(method='GET', url='/v2/{}/related_concepts'.format(graph), params=params, accept_json=True)
86+
return self.request(method='GET', url='/v2/{0}/related_concepts'.format(graph), params=params, accept_json=True)
8787

8888
def get_relation_scores(self, concept_id, concept_ids, graph=WIKIPEDIA_EN_LATEST):
8989
concept_ids = self._expand_concept_or_document_ids(concept_ids, graph)
9090
params = {'concepts': json.dumps(concept_ids)}
91-
return self.request(method='GET', url='/v2/{}/concepts/{}/relation_scores'.format(graph, concept_id),
91+
return self.request(method='GET', url='/v2/{0}/concepts/{1}/relation_scores'.format(graph, concept_id),
9292
params=params, accept_json=True)
9393

9494
def annotate_text(self, text, graph=WIKIPEDIA_EN_LATEST):
95-
return self.request(method='POST', url='/v2/{}/annotate_text'.format(graph), data=text,
95+
return self.request(method='POST', url='/v2/{0}/annotate_text'.format(graph), data=text,
9696
headers={'content-type': 'text/plain'}, accept_json=True)
9797

9898
def list_corpora(self):
@@ -103,19 +103,19 @@ def _get_full_corpus_path(self, corpus, account=None):
103103
return corpus
104104
if account is None:
105105
account = self.get_default_account()
106-
return '/corpora/{}/{}'.format(account, corpus)
106+
return '/corpora/{0}/{1}'.format(account, corpus)
107107

108108
def get_corpus(self, corpus, account=None):
109109
full_corpus_path = self._get_full_corpus_path(corpus, account)
110-
return self.request(method='GET', url='/v2/{}'.format(full_corpus_path), accept_json=True)
110+
return self.request(method='GET', url='/v2/{0}'.format(full_corpus_path), accept_json=True)
111111

112112
def get_corpus_processing_state(self, corpus, account=None):
113113
full_corpus_path = self._get_full_corpus_path(corpus, account)
114-
return self.request(method='GET', url='/v2/{}/processing_state'.format(full_corpus_path), accept_json=True)
114+
return self.request(method='GET', url='/v2/{0}/processing_state'.format(full_corpus_path), accept_json=True)
115115

116116
def get_corpus_stats(self, corpus, account=None):
117117
full_corpus_path = self._get_full_corpus_path(corpus, account)
118-
return self.request(method='GET', url='/v2/{}/stats'.format(full_corpus_path), accept_json=True)
118+
return self.request(method='GET', url='/v2/{0}/stats'.format(full_corpus_path), accept_json=True)
119119

120120
def create_corpus(self, corpus, users=None, access=None, public_fields=None, ttl_hours=None, expires_on=None,
121121
account=None):
@@ -125,11 +125,11 @@ def create_corpus(self, corpus, users=None, access=None, public_fields=None, ttl
125125
'public_fields': public_fields,
126126
'ttl_hours': ttl_hours,
127127
'expires_on': expires_on}
128-
return self.request(method='PUT', url='/v2/{}'.format(full_corpus_path), json=corpus_body)
128+
return self.request(method='PUT', url='/v2/{0}'.format(full_corpus_path), json=corpus_body)
129129

130130
def delete_corpus(self, corpus, account=None):
131131
full_corpus_path = self._get_full_corpus_path(corpus, account)
132-
return self.request(method='DELETE', url='/v2/{}'.format(full_corpus_path))
132+
return self.request(method='DELETE', url='/v2/{0}'.format(full_corpus_path))
133133

134134
def update_corpus_metadata(self, corpus, users, access=None, public_fields=None, ttl_hours=None,
135135
expires_on=None, account=None):
@@ -139,7 +139,7 @@ def update_corpus_metadata(self, corpus, users, access=None, public_fields=None,
139139
'public_fields': public_fields,
140140
'ttl_hours': ttl_hours,
141141
'expires_on': expires_on}
142-
return self.request(method='POST', url='/v2/{}'.format(full_corpus_path), json=corpus_body)
142+
return self.request(method='POST', url='/v2/{0}'.format(full_corpus_path), json=corpus_body)
143143

144144
def search_corpus_by_label(self, corpus, query, concepts=False, prefix=False, limit=10, concept_fields=None,
145145
document_fields=None, account=None):
@@ -154,7 +154,7 @@ def search_corpus_by_label(self, corpus, query, concepts=False, prefix=False, li
154154
'limit': limit,
155155
'concept_fields': concept_fields,
156156
'document_fields': document_fields}
157-
return self.request(method='GET', url='/v2/{}/label_search'.format(full_corpus_path), params=params,
157+
return self.request(method='GET', url='/v2/{0}/label_search'.format(full_corpus_path), params=params,
158158
accept_json=True)
159159

160160
def get_corpus_related_concepts(self, corpus, level=1, limit=10, concept_fields=None, account=None):
@@ -164,14 +164,14 @@ def get_corpus_related_concepts(self, corpus, level=1, limit=10, concept_fields=
164164
params = {'level': level,
165165
'limit': limit,
166166
'concept_fields': concept_fields}
167-
return self.request(method='GET', url='/v2/{}/related_concepts'.format(full_corpus_path), params=params,
167+
return self.request(method='GET', url='/v2/{0}/related_concepts'.format(full_corpus_path), params=params,
168168
accept_json=True)
169169

170170
def get_corpus_relation_scores(self, corpus, concepts, graph=WIKIPEDIA_EN_LATEST, account=None):
171171
full_corpus_path = self._get_full_corpus_path(corpus, account)
172172
concepts = self._expand_concept_or_document_ids(concepts, graph)
173173
params = {'concepts': json.dumps(concepts)}
174-
return self.request(method='GET', url='/v2/{}/relation_scores'.format(full_corpus_path), params=params,
174+
return self.request(method='GET', url='/v2/{0}/relation_scores'.format(full_corpus_path), params=params,
175175
accept_json=True)
176176

177177
def get_corpus_related_documents(self, corpus, ids, graph=WIKIPEDIA_EN_LATEST, cursor=0, limit=10,
@@ -189,7 +189,7 @@ def get_corpus_related_documents(self, corpus, ids, graph=WIKIPEDIA_EN_LATEST, c
189189
'concept_fields': concept_fields,
190190
'document_fields': document_fields
191191
}
192-
return self.request(method='GET', url='/v2/{}/conceptual_search'.format(full_corpus_path), params=params,
192+
return self.request(method='GET', url='/v2/{0}/conceptual_search'.format(full_corpus_path), params=params,
193193
accept_json=True)
194194

195195
def list_documents(self, corpus, limit=20, cursor=0, query=None, account=None):
@@ -199,22 +199,22 @@ def list_documents(self, corpus, limit=20, cursor=0, query=None, account=None):
199199
'cursor': cursor,
200200
'query': query
201201
}
202-
return self.request(method='GET', url='/v2/{}/documents'.format(full_corpus_path), params=params,
202+
return self.request(method='GET', url='/v2/{0}/documents'.format(full_corpus_path), params=params,
203203
accept_json=True)
204204

205205
def get_document(self, corpus, document, account=None):
206206
full_corpus_path = self._get_full_corpus_path(corpus, account)
207-
return self.request(method='GET', url='/v2/{}/documents/{}'.format(full_corpus_path, document),
207+
return self.request(method='GET', url='/v2/{0}/documents/{1}'.format(full_corpus_path, document),
208208
accept_json=True)
209209

210210
def get_document_annotations(self, corpus, document, account=None):
211211
full_corpus_path = self._get_full_corpus_path(corpus, account)
212-
return self.request(method='GET', url='/v2/{}/documents/{}/annotations'.format(full_corpus_path, document),
212+
return self.request(method='GET', url='/v2/{0}/documents/{1}/annotations'.format(full_corpus_path, document),
213213
accept_json=True)
214214

215215
def get_document_processing_state(self, corpus, document, account=None):
216216
full_corpus_path = self._get_full_corpus_path(corpus, account)
217-
return self.request(method='GET', url='/v2/{}/documents/{}/processing_state'.format(full_corpus_path, document),
217+
return self.request(method='GET', url='/v2/{0}/documents/{1}/processing_state'.format(full_corpus_path, document),
218218
accept_json=True)
219219

220220
def get_document_related_concepts(self, corpus, document, level=1, limit=10, concept_fields=None, account=None):
@@ -226,26 +226,28 @@ def get_document_related_concepts(self, corpus, document, level=1, limit=10, con
226226
'limit': limit,
227227
'concept_fields': concept_fields
228228
}
229-
return self.request(method='GET', url='/v2/{}/documents/{}/related_concepts'.format(full_corpus_path, document),
229+
return self.request(method='GET',
230+
url='/v2/{0}/documents/{1}/related_concepts'.format(full_corpus_path, document),
230231
params=params, accept_json=True)
231232

232233
def get_document_relation_scores(self, corpus, document, concepts, graph=WIKIPEDIA_EN_LATEST, account=None):
233234
full_corpus_path = self._get_full_corpus_path(corpus, account)
234235
concept_ids = self._expand_concept_or_document_ids(concepts, graph)
235236
params = {'concepts': json.dumps(concept_ids)}
236-
return self.request(method='GET', url='/v2/{}/documents/{}/relation_scores'.format(full_corpus_path, document),
237+
return self.request(method='GET',
238+
url='/v2/{0}/documents/{1}/relation_scores'.format(full_corpus_path, document),
237239
params=params, accept_json=True)
238240

239241
def create_document(self, corpus, document, document_contents, account=None):
240242
full_corpus_path = self._get_full_corpus_path(corpus, account)
241-
return self.request(method='PUT', url='/v2/{}/documents/{}'.format(full_corpus_path, document),
243+
return self.request(method='PUT', url='/v2/{0}/documents/{1}'.format(full_corpus_path, document),
242244
json=document_contents)
243245

244246
def update_document(self, corpus, document, document_contents, account=None):
245247
full_corpus_path = self._get_full_corpus_path(corpus, account)
246-
return self.request(method='POST', url='/v2/{}/documents/{}'.format(full_corpus_path, document),
248+
return self.request(method='POST', url='/v2/{0}/documents/{1}'.format(full_corpus_path, document),
247249
json=document_contents)
248250

249251
def delete_document(self, corpus, document, account=None):
250252
full_corpus_path = self._get_full_corpus_path(corpus, account)
251-
return self.request(method='DELETE', url='/v2/{}/documents/{}'.format(full_corpus_path, document))
253+
return self.request(method='DELETE', url='/v2/{0}/documents/{1}'.format(full_corpus_path, document))

‎watson_developer_cloud/dialog_v1.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def get_dialogs(self):
3434
def get_dialog(self, dialog_id, accept='application/wds+json'):
3535
accept_json = accept == self.dialog_json_format
3636
headers = {'accept': accept}
37-
return self.request(method='GET', url='/v1/dialogs/{}'.format(dialog_id), headers=headers,
37+
return self.request(method='GET', url='/v1/dialogs/{0}'.format(dialog_id), headers=headers,
3838
accept_json=accept_json)
3939

4040
def create_dialog(self, dialog_file, name):
@@ -43,23 +43,23 @@ def create_dialog(self, dialog_file, name):
4343

4444
def update_dialog(self, dialog_id, dialog_file):
4545
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
46-
return self.request(method='PUT', url='/v1/dialogs/{}'.format(dialog_id), files={'file': dialog_file},
46+
return self.request(method='PUT', url='/v1/dialogs/{0}'.format(dialog_id), files={'file': dialog_file},
4747
accept_json=True)
4848

4949
def get_content(self, dialog_id):
5050
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
51-
return self.request(method='GET', url='/v1/dialogs/{}/content'.format(dialog_id), accept_json=True)
51+
return self.request(method='GET', url='/v1/dialogs/{0}/content'.format(dialog_id), accept_json=True)
5252

5353
def update_content(self, dialog_id, content):
5454
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
55-
return self.request(method='PUT', url='/v1/dialogs/{}/content'.format(dialog_id), json=content,
55+
return self.request(method='PUT', url='/v1/dialogs/{0}/content'.format(dialog_id), json=content,
5656
accept_json=True)
5757

5858
def conversation(self, dialog_id, dialog_input=None, client_id=None, conversation_id=None):
5959
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
6060
data = {'input': dialog_input, 'client_id': client_id,
6161
'conversation_id': conversation_id}
62-
return self.request(method='POST', url='/v1/dialogs/{}/conversation'.format(dialog_id), data=data,
62+
return self.request(method='POST', url='/v1/dialogs/{0}/conversation'.format(dialog_id), data=data,
6363
accept_json=True)
6464

6565
@staticmethod
@@ -71,14 +71,14 @@ def get_conversation(self, dialog_id, date_from, date_to):
7171
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
7272
params = {'date_from': self._format_date(
7373
date_from), 'date_to': self._format_date(date_to)}
74-
return self.request(method='GET', url='/v1/dialogs/{}/conversation'.format(dialog_id), params=params,
74+
return self.request(method='GET', url='/v1/dialogs/{0}/conversation'.format(dialog_id), params=params,
7575
accept_json=True)
7676

7777
def get_profile(self, dialog_id, client_id, name=None):
7878
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
7979
client_id = self.unpack_id(client_id, 'client_id')
8080
params = {'client_id': client_id, 'name': name}
81-
return self.request(method='GET', url='/v1/dialogs/{}/profile'.format(dialog_id), params=params,
81+
return self.request(method='GET', url='/v1/dialogs/{0}/profile'.format(dialog_id), params=params,
8282
accept_json=True)
8383

8484
def update_profile(self, dialog_id, name_values, client_id=None):
@@ -90,8 +90,9 @@ def update_profile(self, dialog_id, name_values, client_id=None):
9090
'client_id': client_id,
9191
'name_values': name_values
9292
}
93-
return self.request(method='PUT', url='/v1/dialogs/{}/profile'.format(dialog_id), json=params, accept_json=True)
93+
return self.request(method='PUT', url='/v1/dialogs/{0}/profile'.format(dialog_id), json=params,
94+
accept_json=True)
9495

9596
def delete_dialog(self, dialog_id):
9697
dialog_id = self.unpack_id(dialog_id, 'dialog_id')
97-
return self.request(method='DELETE', url='/v1/dialogs/{}'.format(dialog_id), accept_json=True)
98+
return self.request(method='DELETE', url='/v1/dialogs/{0}'.format(dialog_id), accept_json=True)

‎watson_developer_cloud/language_translation_v2.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ def create_model(self, base_model_id, name=None, forced_glossary=None, parallel_
5757
return self.request(method='POST', url='/v2/models', params=params, files=files, accept_json=True)
5858

5959
def get_model(self, model_id):
60-
return self.request(method='GET', url='/v2/models/{}'.format(model_id), accept_json=True)
60+
return self.request(method='GET', url='/v2/models/{0}'.format(model_id), accept_json=True)
6161

6262
def delete_model(self, model_id):
63-
return self.request(method='DELETE', url='/v2/models/{}'.format(model_id), accept_json=True)
63+
return self.request(method='DELETE', url='/v2/models/{0}'.format(model_id), accept_json=True)
6464

6565
def translate(self, text, source=None, target=None, model=None):
6666
"""

‎watson_developer_cloud/natural_language_classifier_v1.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ def list(self):
4545

4646
def status(self, classifier_id):
4747
classifier_id = self.unpack_id(classifier_id, 'classifier_id')
48-
return self.request(method='GET', url='/v1/classifiers/{}'.format(classifier_id), accept_json=True)
48+
return self.request(method='GET', url='/v1/classifiers/{0}'.format(classifier_id), accept_json=True)
4949

5050
def classify(self, classifier_id, text):
5151
classifier_id = self.unpack_id(classifier_id, 'classifier_id')
52-
return self.request(method='POST', url='/v1/classifiers/{}/classify'.format(classifier_id), accept_json=True,
52+
return self.request(method='POST', url='/v1/classifiers/{0}/classify'.format(classifier_id), accept_json=True,
5353
json={'text': text})
5454

5555
def remove(self, classifier_id):
5656
classifier_id = self.unpack_id(classifier_id, 'classifier_id')
57-
return self.request(method='DELETE', url='/v1/classifiers/{}'.format(classifier_id), accept_json=True)
57+
return self.request(method='DELETE', url='/v1/classifiers/{0}'.format(classifier_id), accept_json=True)

0 commit comments

Comments
 (0)