summaryrefslogtreecommitdiff
path: root/butterfly/connection.py
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-04-07 18:07:28 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-04-07 18:07:28 +0100
commit736fb204bff174c21616ebb899fb8eaa144d1455 (patch)
tree1fb93166e4c1d221f5cc7382db990a117e09b59e /butterfly/connection.py
parent0a2243f54a2bab1b13c54c5527970fd49118288f (diff)
connection: only remove the HTTP proxy from the dict if one exists
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'butterfly/connection.py')
-rw-r--r--butterfly/connection.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/butterfly/connection.py b/butterfly/connection.py
index ab81257..78e66f2 100644
--- a/butterfly/connection.py
+++ b/butterfly/connection.py
@@ -171,7 +171,8 @@ class ButterflyConnection(telepathy.server.Connection,
proxy = self._suggested_proxies.pop(0)
if proxy == 'direct://':
- del self._proxies['http']
+ if 'http' in self._proxies:
+ del self._proxies['http']
return True
# libproxy documentation states: