Merge pull request #1350 from deis/1254-cookie-error

Matthew Fisher · Matthew Fisher · commit 620503756120 · 2014-07-25T12:36:28.000-07:00
fix(client): KeyError on cookie retrieval
diff --git a/client/deis.py b/client/deis.py
@@ -371,7 +371,7 @@ def _dispatch(self, method, path, body=None, **kwargs):
             'X-Deis-Version': __version__.rsplit('.', 1)[0],
         }
         func = getattr(self._session, method.lower())
-        controller = self._settings['controller']
+        controller = self._settings.get('controller')
         if not controller:
             raise EnvironmentError(
                 'No active controller. Use `deis login` or `deis register` to get started.')

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ def _dispatch(self, method, path, body=None, **kwargs):`
`371`	`371`	`'X-Deis-Version': __version__.rsplit('.', 1)[0],`
`372`	`372`	`}`
`373`	`373`	`func = getattr(self._session, method.lower())`
`374`		`- controller = self._settings['controller']`
	`374`	`+ controller = self._settings.get('controller')`
`375`	`375`	`if not controller:`
`376`	`376`	`raise EnvironmentError(`
`377`	`377`	'No active controller. Use `deis login` or `deis register` to get started.')