Skip to content

Commit

Permalink
fix web_agent() if no socks_config supplied
Browse files Browse the repository at this point in the history
  • Loading branch information
meejah committed Jul 3, 2016
1 parent a415169 commit 23cdd98
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion txtorcon/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,10 @@ def web_agent(self, socks_config=None, pool=None):
from txtorcon import web

# XXX make this a method, use in Circuit.web_agent
if socks_config is not None:
if socks_config is None:
socks_config = self.config.socks_endpoint(self._reactor, None)

else:
if isinstance(socks_config, six.text_type):
socks_config = self.config.socks_endpoint(
self._reactor,
Expand Down

0 comments on commit 23cdd98

Please sign in to comment.