[tor-commits] [ooni-probe/master] Fix bug that mistakenly reports unsupported twisted version

[art@xxxxxxxxxxxxxx]

commit 113fd7f69afab9d5e4f8e98b195f4969b69920a5
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Sun Nov 25 17:07:36 2012 +0100

    Fix bug that mistakenly reports unsupported twisted version
---
 ooni/utils/txagentwithsocks.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ooni/utils/txagentwithsocks.py b/ooni/utils/txagentwithsocks.py
index 7b000fc..49e5a3c 100644
--- a/ooni/utils/txagentwithsocks.py
+++ b/ooni/utils/txagentwithsocks.py
@@ -262,7 +262,7 @@ class Agent(client.Agent):
         self._socksport = socksport
 
     def request(self, method, uri, headers=None, bodyProducer=None):
-        if uri.startswith('shttp') or uri.startswith('httpo'):
+        if (uri.startswith('shttp') or uri.startswith('httpo')) and not HTTPConnectionPool:
             log.err("Requests over SOCKS are supported only with versions of Twisted >= 12.1.0")
             raise UnsupportedTwistedVersion
         return client.Agent.request(self, method, uri, headers, bodyProducer)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits