Skip to content

Commit 3c360fb

Browse files
committed
adding verb noun format to methods
1 parent cad138e commit 3c360fb

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed

opentok/endpoints.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ def __init__(self, api_url, api_key):
88
self.api_url = api_url
99
self.api_key = api_key
1010

11-
def session_url(self):
11+
def get_session_url(self):
1212
url = self.api_url + "/session/create"
1313
return url
1414

15-
def archive_url(self, archive_id=None):
15+
def get_archive_url(self, archive_id=None):
1616
url = self.api_url + "/v2/project/" + self.api_key + "/archive"
1717
if archive_id:
1818
url = url + "/" + archive_id
1919
return url
2020

21-
def signaling_url(self, session_id, connection_id=None):
21+
def get_signaling_url(self, session_id, connection_id=None):
2222
url = self.api_url + "/v2/project/" + self.api_key + "/session/" + session_id
2323

2424
if connection_id:
@@ -83,7 +83,7 @@ def set_stream_class_lists_url(self, session_id):
8383
)
8484
return url
8585

86-
def broadcast_url(self, broadcast_id=None, stop=False, layout=False):
86+
def get_broadcast_url(self, broadcast_id=None, stop=False, layout=False):
8787
""" this method returns urls for working with broadcast """
8888
url = self.api_url + "/v2/project/" + self.api_key + "/broadcast"
8989

opentok/opentok.py

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ def create_session(
371371

372372
try:
373373
response = requests.post(
374-
self.endpoints.session_url(),
374+
self.endpoints.get_session_url(),
375375
data=options,
376-
headers=self.headers(),
376+
headers=self.get_headers(),
377377
proxies=self.proxies,
378378
timeout=self.timeout,
379379
)
@@ -412,7 +412,7 @@ def create_session(
412412
except Exception as e:
413413
raise OpenTokException("Failed to generate session: %s" % str(e))
414414

415-
def headers(self):
415+
def get_headers(self):
416416
"""For internal use."""
417417
return {
418418
"User-Agent": "OpenTok-Python-SDK/"
@@ -422,9 +422,9 @@ def headers(self):
422422
"X-OPENTOK-AUTH": self._create_jwt_auth_header(),
423423
}
424424

425-
def json_headers(self):
425+
def get_json_headers(self):
426426
"""For internal use."""
427-
result = self.headers()
427+
result = self.get_headers()
428428
result["Content-Type"] = "application/json"
429429
return result
430430

@@ -495,9 +495,9 @@ def start_archive(
495495
}
496496

497497
response = requests.post(
498-
self.endpoints.archive_url(),
498+
self.endpoints.get_archive_url(),
499499
data=json.dumps(payload),
500-
headers=self.json_headers(),
500+
headers=self.get_json_headers(),
501501
proxies=self.proxies,
502502
timeout=self.timeout,
503503
)
@@ -534,8 +534,8 @@ def stop_archive(self, archive_id):
534534
:rtype: The Archive object corresponding to the archive being stopped.
535535
"""
536536
response = requests.post(
537-
self.endpoints.archive_url(archive_id) + "/stop",
538-
headers=self.json_headers(),
537+
self.endpoints.get_archive_url(archive_id) + "/stop",
538+
headers=self.get_json_headers(),
539539
proxies=self.proxies,
540540
timeout=self.timeout,
541541
)
@@ -562,8 +562,8 @@ def delete_archive(self, archive_id):
562562
:param String archive_id: The archive ID of the archive to be deleted.
563563
"""
564564
response = requests.delete(
565-
self.endpoints.archive_url(archive_id),
566-
headers=self.json_headers(),
565+
self.endpoints.get_archive_url(archive_id),
566+
headers=self.get_json_headers(),
567567
proxies=self.proxies,
568568
timeout=self.timeout,
569569
)
@@ -585,8 +585,8 @@ def get_archive(self, archive_id):
585585
:rtype: The Archive object.
586586
"""
587587
response = requests.get(
588-
self.endpoints.archive_url(archive_id),
589-
headers=self.json_headers(),
588+
self.endpoints.get_archive_url(archive_id),
589+
headers=self.get_json_headers(),
590590
proxies=self.proxies,
591591
timeout=self.timeout,
592592
)
@@ -621,11 +621,11 @@ def get_archives(self, offset=None, count=None, session_id=None):
621621
if session_id is not None:
622622
params["sessionId"] = session_id
623623

624-
endpoint = self.endpoints.archive_url() + "?" + urlencode(params)
624+
endpoint = self.endpoints.get_archive_url() + "?" + urlencode(params)
625625

626626
response = requests.get(
627627
endpoint,
628-
headers=self.json_headers(),
628+
headers=self.get_json_headers(),
629629
proxies=self.proxies,
630630
timeout=self.timeout,
631631
)
@@ -646,7 +646,7 @@ def list_archives(self, offset=None, count=None, session_id=None):
646646
"""
647647
return self.get_archives(offset, count, session_id)
648648

649-
def signal(self, session_id, payload, connection_id=None):
649+
def send_signal(self, session_id, payload, connection_id=None):
650650
"""
651651
Send signals to all participants in an active OpenTok session or to a specific client
652652
connected to that session.
@@ -662,9 +662,9 @@ def signal(self, session_id, payload, connection_id=None):
662662
connected to the session
663663
"""
664664
response = requests.post(
665-
self.endpoints.signaling_url(session_id, connection_id),
665+
self.endpoints.get_signaling_url(session_id, connection_id),
666666
data=json.dumps(payload),
667-
headers=self.json_headers(),
667+
headers=self.get_json_headers(),
668668
proxies=self.proxies,
669669
timeout=self.timeout,
670670
)
@@ -702,7 +702,7 @@ def get_stream(self, session_id, stream_id):
702702
endpoint = self.endpoints.get_stream_url(session_id, stream_id)
703703
response = requests.get(
704704
endpoint,
705-
headers=self.json_headers(),
705+
headers=self.get_json_headers(),
706706
proxies=self.proxies,
707707
timeout=self.timeout,
708708
)
@@ -732,7 +732,7 @@ def list_streams(self, session_id):
732732

733733
response = requests.get(
734734
endpoint,
735-
headers=self.json_headers(),
735+
headers=self.get_json_headers(),
736736
proxies=self.proxies,
737737
timeout=self.timeout,
738738
)
@@ -760,7 +760,7 @@ def force_disconnect(self, session_id, connection_id):
760760
endpoint = self.endpoints.force_disconnect_url(session_id, connection_id)
761761
response = requests.delete(
762762
endpoint,
763-
headers=self.json_headers(),
763+
headers=self.get_json_headers(),
764764
proxies=self.proxies,
765765
timeout=self.timeout,
766766
)
@@ -806,7 +806,7 @@ def set_archive_layout(self, archive_id, layout_type, stylesheet=None):
806806
response = requests.put(
807807
endpoint,
808808
data=json.dumps(payload),
809-
headers=self.json_headers(),
809+
headers=self.get_json_headers(),
810810
proxies=self.proxies,
811811
timeout=self.timeout,
812812
)
@@ -877,7 +877,7 @@ def dial(self, session_id, token, sip_uri, options=[]):
877877
response = requests.post(
878878
endpoint,
879879
data=json.dumps(payload),
880-
headers=self.json_headers(),
880+
headers=self.get_json_headers(),
881881
proxies=self.proxies,
882882
timeout=self.timeout,
883883
)
@@ -922,7 +922,7 @@ class names (Strings) to apply to the stream. For example:
922922
response = requests.put(
923923
endpoint,
924924
data=json.dumps(items_payload),
925-
headers=self.json_headers(),
925+
headers=self.get_json_headers(),
926926
proxies=self.proxies,
927927
timeout=self.timeout,
928928
)
@@ -981,11 +981,11 @@ def start_broadcast(self, session_id, options):
981981

982982
payload.update(options)
983983

984-
endpoint = self.endpoints.broadcast_url()
984+
endpoint = self.endpoints.get_broadcast_url()
985985
response = requests.post(
986986
endpoint,
987987
data=json.dumps(payload),
988-
headers=self.json_headers(),
988+
headers=self.get_json_headers(),
989989
proxies=self.proxies,
990990
timeout=self.timeout,
991991
)
@@ -1015,10 +1015,10 @@ def stop_broadcast(self, broadcast_id):
10151015
:rtype A Broadcast object, which contains information of the broadcast: id, sessionId
10161016
projectId, createdAt, updatedAt and resolution
10171017
"""
1018-
endpoint = self.endpoints.broadcast_url(broadcast_id, stop=True)
1018+
endpoint = self.endpoints.get_broadcast_url(broadcast_id, stop=True)
10191019
response = requests.post(
10201020
endpoint,
1021-
headers=self.json_headers(),
1021+
headers=self.get_json_headers(),
10221022
proxies=self.proxies,
10231023
timeout=self.timeout,
10241024
)
@@ -1049,10 +1049,10 @@ def get_broadcast(self, broadcast_id):
10491049
:rtype A Broadcast object, which contains information of the broadcast: id, sessionId
10501050
projectId, createdAt, updatedAt, resolution, broadcastUrls and status
10511051
"""
1052-
endpoint = self.endpoints.broadcast_url(broadcast_id)
1052+
endpoint = self.endpoints.get_broadcast_url(broadcast_id)
10531053
response = requests.get(
10541054
endpoint,
1055-
headers=self.json_headers(),
1055+
headers=self.get_json_headers(),
10561056
proxies=self.proxies,
10571057
timeout=self.timeout,
10581058
)
@@ -1091,11 +1091,11 @@ def set_broadcast_layout(self, broadcast_id, layout_type, stylesheet=None):
10911091
if stylesheet is not None:
10921092
payload["stylesheet"] = stylesheet
10931093

1094-
endpoint = self.endpoints.broadcast_url(broadcast_id, layout=True)
1094+
endpoint = self.endpoints.get_broadcast_url(broadcast_id, layout=True)
10951095
response = requests.put(
10961096
endpoint,
10971097
data=json.dumps(payload),
1098-
headers=self.json_headers(),
1098+
headers=self.get_json_headers(),
10991099
proxies=self.proxies,
11001100
timeout=self.timeout,
11011101
)

tests/test_signal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_signal(self):
3939
content_type=u("application/json"),
4040
)
4141

42-
self.opentok.signal(self.session_id, data)
42+
self.opentok.send_signal(self.session_id, data)
4343

4444
validate_jwt_header(self, httpretty.last_request().headers[u("x-opentok-auth")])
4545
expect(httpretty.last_request().headers[u("user-agent")]).to(
@@ -81,7 +81,7 @@ def test_signal_with_connection_id(self):
8181
content_type=u("application/json"),
8282
)
8383

84-
self.opentok.signal(self.session_id, data, connection_id)
84+
self.opentok.send_signal(self.session_id, data, connection_id)
8585

8686
validate_jwt_header(self, httpretty.last_request().headers[u("x-opentok-auth")])
8787
expect(httpretty.last_request().headers[u("user-agent")]).to(

0 commit comments

Comments
 (0)