[Pkg-privacy-commits] [txtorcon] 41/49: pep8

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository txtorcon.

commit 920ff4400984af08ded16b50e2708d48334939c2
Author: meejah <meejah at meejah.ca>
Date:   Sat Sep 26 23:54:25 2015 -0600

    pep8
---
 test/test_endpoints.py | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/test_endpoints.py b/test/test_endpoints.py
index 4fe193d..a101597 100644
--- a/test/test_endpoints.py
+++ b/test/test_endpoints.py
@@ -535,18 +535,12 @@ class FakeReactorTcp(FakeReactor):
 
 class FakeTorSocksEndpoint(object):
     def __init__(self, *args, **kw):
-        self.host     = args[1]
-        self.port     = args[2]
+        self.host = args[1]
+        self.port = args[2]
         self.transport = None
 
-        if kw.has_key('failure'):
-            self.failure = kw['failure']
-        else:
-            self.failure = None
-        if kw.has_key('acceptPort'):
-            self.acceptPort = kw['acceptPort']
-        else:
-            self.acceptPort = None
+        self.failure = kw.get('failure', None)
+        self.acceptPort = kw.get('acceptPort', None)
 
     def connect(self, fac):
         self.factory = fac
@@ -639,7 +633,7 @@ class TestTorClientEndpoint(unittest.TestCase):
         for port in success_ports:
             def TorSocksEndpointGenerator(*args, **kw):
                 kw['acceptPort'] = port
-                kw['failure']    = connectionRefusedFailure
+                kw['failure'] = connectionRefusedFailure
                 return FakeTorSocksEndpoint(*args, **kw)
             endpoint = TorClientEndpoint('', 0, _proxy_endpoint_generator=TorSocksEndpointGenerator)
             endpoint.connect(None)
@@ -653,7 +647,7 @@ class TestTorClientEndpoint(unittest.TestCase):
         for port in fail_ports:
             def TorSocksEndpointGenerator(*args, **kw):
                 kw['acceptPort'] = port
-                kw['failure']    = connectionRefusedFailure
+                kw['failure'] = connectionRefusedFailure
                 return FakeTorSocksEndpoint(*args, **kw)
             endpoint = TorClientEndpoint('', 0, _proxy_endpoint_generator=TorSocksEndpointGenerator)
             d = endpoint.connect(None)
@@ -666,7 +660,7 @@ class TestTorClientEndpoint(unittest.TestCase):
         """
         def TorSocksEndpointGenerator(*args, **kw):
             kw['acceptPort'] = 6669
-            kw['failure']    = connectionRefusedFailure
+            kw['failure'] = connectionRefusedFailure
             return FakeTorSocksEndpoint(*args, **kw)
         endpoint = TorClientEndpoint('', 0, _proxy_endpoint_generator=TorSocksEndpointGenerator, socks_port=6669)
         endpoint.connect(None)
@@ -680,7 +674,7 @@ class TestTorClientEndpoint(unittest.TestCase):
         """
         def TorSocksEndpointGenerator(*args, **kw):
             kw['acceptPort'] = 9050
-            kw['failure']    = connectionRefusedFailure
+            kw['failure'] = connectionRefusedFailure
             return FakeTorSocksEndpoint(*args, **kw)
         endpoint = TorClientEndpoint('', 0, _proxy_endpoint_generator=TorSocksEndpointGenerator, socks_port=6669)
         d = endpoint.connect(None)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git