Merge pull request #18 from kizzard/fix/api_location

dpjanes · web-flow · commit 1f95ea0863cc · 2017-05-22T07:44:22.000-04:00
Pull user specific API URL from json file api_location property
diff --git a/smartthings.py b/smartthings.py
@@ -78,7 +78,7 @@ def request_endpoints(self):
     def request_devices(self, device_type):
         """List the devices"""
 
-        devices_url = "https://graph.api.smartthings.com%s/%s" % ( self.endpointd["url"], device_type, )
+        devices_url = "https://%s%s/%s" % ( self.std.get("api_location", "graph.api.smartthings.com"), self.endpointd["url"], device_type, )
         devices_paramd = {
         }
         devices_headerd = {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ def request_endpoints(self):`
`78`	`78`	`def request_devices(self, device_type):`
`79`	`79`	`"""List the devices"""`
`80`	`80`
`81`		`- devices_url = "https://graph.api.smartthings.com%s/%s" % ( self.endpointd["url"], device_type, )`
	`81`	`+ devices_url = "https://%s%s/%s" % ( self.std.get("api_location", "graph.api.smartthings.com"), self.endpointd["url"], device_type, )`
`82`	`82`	`devices_paramd = {`
`83`	`83`	`}`
`84`	`84`	`devices_headerd = {`