Merge pull request twilio#13 from makaimc/wds

skimbrel · skimbrel · commit 9744776720e4 · 2015-02-12T15:23:03.000-08:00
fixing init timeout argument bug in task queues and workers
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -292,7 +292,7 @@ def task_queues(self, workspace_sid):
         the given workspace_sid
         """
         base_uri = "{}/{}".format(self.workspace_uri, workspace_sid)
-        return TaskQueues(base_uri, self.auth)
+        return TaskQueues(base_uri, self.auth, self.timeout)
 
     def tasks(self, workspace_sid):
         """
diff --git a/twilio/rest/resources/task_router/workers.py b/twilio/rest/resources/task_router/workers.py
@@ -29,7 +29,7 @@ class Workers(NextGenListResource):
     name = "Workers"
     instance = Worker
 
-    def __init__(self, base_uri, auth, **kwargs):
+    def __init__(self, base_uri, auth, timeout, **kwargs):
         super(Workers, self).__init__(base_uri, auth, **kwargs)
         self.statistics = Statistics(self.uri, auth, **kwargs)
 
diff --git a/twilio/rest/resources/task_router/workflows.py b/twilio/rest/resources/task_router/workflows.py
@@ -37,7 +37,7 @@ def create(self, friendly_name, configuration, assignment_callback_url,
         :param friendly_name: A string representing a human readable name for
             this Workflow. Examples include 'Inbound Call Workflow' or '2014
             Outbound Campaign'.
-        :param configuration: YAML document configuring the rules for this
+        :param configuration: JSON document configuring the rules for this
             Workflow.
         :param assignment_callback_url: A valid URL for the application that
             will process task assignment events.

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Workers(NextGenListResource):`
`29`	`29`	`name = "Workers"`
`30`	`30`	`instance = Worker`
`31`	`31`
`32`		`- def __init__(self, base_uri, auth, **kwargs):`
	`32`	`+ def __init__(self, base_uri, auth, timeout, **kwargs):`
`33`	`33`	`super(Workers, self).__init__(base_uri, auth, **kwargs)`
`34`	`34`	`self.statistics = Statistics(self.uri, auth, **kwargs)`
`35`	`35`