8000 Remove deprecated functionality from TaskRouterCapability · chunkingz/twilio-python@c155c17 · GitHub
[go: up one dir, main page]
Skip to content

Commit c155c17

Browse files
author
matt
committed
Remove deprecated functionality from TaskRouterCapability
1 parent 5e3ea2f commit c155c17

File tree

1 file changed

+11
-67
lines changed

1 file changed

+11
-67
lines changed

‎twilio/jwt/task_router.py

Lines changed: 11 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import time
2-
import warnings
32

43
from twilio import jwt
54

6-
warnings.simplefilter('always', DeprecationWarning)
7-
85
TASK_ROUTER_BASE_URL = 'https://taskrouter.twilio.com'
96
TASK_ROUTER_BASE_EVENTS_URL = 'https://event-bridge.twilio.com/v1/wschannels'
107
TASK_ROUTER_VERSION = "v1"
@@ -13,18 +10,6 @@
1310
OPTIONAL = {'required': False}
1411

1512

16-
def deprecated(func):
17-
def log_warning(*args, **kwargs):
18-
# stacklevel = 2 makes the warning refer to the caller of the
19-
# deprecation rather than the source of deprecation itself
20-
warnings.warn("Call to deprecated function {0}.".
21-
format(func.__name__),
22-
stacklevel=2,
23-
category=DeprecationWarning)
10000 24-
return func(*args, **kwargs)
25-
return log_warning
26-
27-
2813
class TaskRouterCapability(object):
2914
def __init__(self, account_sid, auth_token, workspace_sid, channel_id):
3015
self.account_sid = account_sid
@@ -44,7 +29,7 @@ def __init__(self, account_sid, auth_token, workspace_sid, channel_id):
4429
self.allow_web_sockets(channel_id)
4530

4631
# set up resources
47-
self.setup_resource()
32+
self.resource_url = self.setup_resource()
4833

4934
# add permissions to fetch the instance resource
5035
self.add_policy(self.resource_url, "GET", True)
@@ -54,23 +39,7 @@ def channel_prefix(self):
5439
return self.channel_id[0:2]
5540

5641
def setup_resource(self):
57-
if self.channel_prefix == "WS":
58-
self.resource_url = self.base_url
59-
elif self.channel_prefix == "WK":
60-
self.resource_url = self.base_url + "/Workers/" + self.channel_id
61-
62-
activity_url = self.base_url + "/Activities"
63-
self.allow(activity_url, "GET")
64-
65-
tasks_url = self.base_url + "/Tasks/**"
66-
self.allow(tasks_url, "GET")
67-
68-
worker_reservations_url = self.resource_url + "/Reservations/**"
69-
self.allow(worker_reservations_url, "GET")
70-
71-
elif self.channel_prefix == "WQ":
72-
self.resource_url = "{0}/TaskQueues/{1}".format(
73-
self.base_url, self.channel_id)
42+
return self.base_url
7443

7544
def allow_web_sockets(self, channel_id):
7645
web_socket_url = "{0}/{1}/{2}".format(TASK_ROUTER_BASE_EVENTS_URL,
@@ -109,37 +78,6 @@ def allow_delete(self):
10978
def allow_delete_subresources(self):
11079
self.allow(self.resource_url + "/**", "DELETE")
11180

112-
@deprecated
113-
def allow_worker_fetch_attributes(self):
114-
if self.channel_prefix != "WK":
115-
raise ValueError("Deprecated func not applicable to non Worker")
116-
else:
117-
self.policies.append(self.make_policy(
118-
self.resource_url,
119-
'GET'))
120-
121-
@deprecated
122-
def allow_worker_activity_updates(self):
123-
if self.channel_prefix == "WK":
124-
self.policies.append(self.make_policy(
125-
self.resource_url,
126-
'POST',
127-
True,
128-
post_filter={'ActivitySid': REQUIRED}))
129-
else:
130-
raise ValueError("Deprecated func not applicable to non Worker")
131-
132-
@deprecated
133-
def allow_task_reservation_updates(self):
134-
if self.channel_prefix == "WK":
135-
tasks_url = self.base_url + "/Tasks/**"
136-
self.policies.append(self.make_policy(
137-
tasks_url,
138-
'POST',
139-
True))
140-
else:
141-
raise ValueError("Deprecated func not applicable to non Worker")
142-
14381
def add_policy(self, url, method,
14482
allowed, query_filter=None, post_filter=None):
14583

@@ -224,7 +162,7 @@ def __init__(self, account_sid, auth_token, workspace_sid, worker_sid):
224162
self.allow(self.worker_reservations_url, "GET")
225163

226164
def setup_resource(self):
227-
self.resource_url = self.base_url + "/Workers/" + self.channel_id
165+
return self.base_url + "/Workers/" + self.channel_id
228166

229167
def allow_activity_updates(self):
230168
self.policies.append(self.make_policy(
@@ -245,8 +183,14 @@ def allow_reservation_updates(self):
245183

246184

247185
class TaskRouterTaskQueueCapability(TaskRouterCapability):
186+
def __init__(self, account_sid, auth_token, workspace_sid, task_queue_sid):
187+
super(TaskRouterTaskQueueCapability, self).__init__(account_sid,
188+
auth_token,
189+
workspace_sid,
190+
task_queue_sid)
191+
248192
def setup_resource(self):
249-
self.resource_url = self.base_url + "/TaskQueues/" + self.channel_id
193+
return self.base_url + "/TaskQueues/" + self.channel_id
250194

251195

252196
class TaskRouterWorkspaceCapability(TaskRouterCapability):
@@ -257,4 +201,4 @@ def __init__(self, account_sid, auth_token, workspace_sid):
257201
workspace_sid)
258202

259203
def setup_resource(self):
260-
self.resource_url = self.base_url
204+
return self.base_url

0 commit comments

Comments
 (0)
0