X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/62ec1b07870ed00d93fbb3a7e4093c34af302bc4..99407dab6c2455664a46e0c171972cfd7b61f43b:/tests/test_util.py

diff --git a/tests/test_util.py b/tests/test_util.py
index 85800d1..b8efea9 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -18,7 +18,7 @@ def test_find_links():
     assert find_links("http://abc") == ("%s", ["http://abc"])
     assert find_links("t http://abc") == ("t %s", ["http://abc"])
     assert find_links("http://abc t") == ("%s t", ["http://abc"])
-    assert find_links("1 http://a 2 http://b 3") == ("1 %s 2 %s 3", 
+    assert find_links("1 http://a 2 http://b 3") == ("1 %s 2 %s 3",
         ["http://a", "http://b"])
     assert find_links("%") == ("%%", [])
     assert find_links("(http://abc)") == ("(%s)", ["http://abc"])
@@ -30,11 +30,11 @@ Response = namedtuple('Response', 'path code headers')
 def start_server(*resp):
     """HTTP server replying with the given responses to the expected
     requests."""
-    def url(port, path): 
+    def url(port, path):
         return 'http://%s:%s%s' % (socket.gethostname(), port, path)
-    
+
     responses = list(reversed(resp))
-    
+
     class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         def do_HEAD(self):
             response = responses.pop()
@@ -43,7 +43,7 @@ def start_server(*resp):
             for header, value in list(response.headers.items()):
                 self.send_header(header, value)
             self.end_headers()
-            
+
     httpd = SocketServer.TCPServer(("", 0), MyHandler)
     t = threading.Thread(target=httpd.serve_forever)
     t.setDaemon(True)
@@ -51,7 +51,7 @@ def start_server(*resp):
     port = httpd.server_address[1]
     yield functools.partial(url, port)
     httpd.shutdown()
-    
+
 def test_follow_redirects_direct_link():
     link = "/resource"
     with start_server(Response(link, 200, {})) as url:
@@ -61,10 +61,10 @@ def test_follow_redirects_redirected_link():
     redirected = "/redirected"
     link = "/resource"
     with start_server(
-        Response(link, 301, {"Location": redirected}), 
+        Response(link, 301, {"Location": redirected}),
         Response(redirected, 200, {})) as url:
         assert url(redirected) == follow_redirects(url(link))
-        
+
 def test_follow_redirects_unavailable():
     link = "/resource"
     with start_server(Response(link, 404, {})) as url:
@@ -74,7 +74,7 @@ def test_follow_redirects_link_to_last_available():
     unavailable = "/unavailable"
     link = "/resource"
     with start_server(
-        Response(link, 301, {"Location": unavailable}), 
+        Response(link, 301, {"Location": unavailable}),
         Response(unavailable, 404, {})) as url:
         assert url(unavailable) == follow_redirects(url(link))
 
@@ -82,7 +82,7 @@ def test_follow_redirects_link_to_last_available():
 def test_follow_redirects_no_where():
     link = "http://links.nowhere/"
     assert link == follow_redirects(link)
-    
+
 def test_follow_redirects_link_to_nowhere():
     unavailable = "http://links.nowhere/"
     link = "/resource"
@@ -101,7 +101,7 @@ def test_follow_redirects_filtered_by_site_after_redirect():
     redirected = "/redirected"
     filtered = "http://dont-follow/"
     with start_server(
-        Response(link, 301, {"Location": redirected}), 
+        Response(link, 301, {"Location": redirected}),
         Response(redirected, 301, {"Location": filtered})) as url:
         hosts = [socket.gethostname()]
         assert filtered == follow_redirects(url(link), hosts)
@@ -110,7 +110,7 @@ def test_follow_redirects_filtered_by_site_allowed():
     redirected = "/redirected"
     link = "/resource"
     with start_server(
-        Response(link, 301, {"Location": redirected}), 
+        Response(link, 301, {"Location": redirected}),
         Response(redirected, 200, {})) as url:
         hosts = [socket.gethostname()]
         assert url(redirected) == follow_redirects(url(link), hosts)
@@ -119,7 +119,7 @@ def test_expand_line():
     redirected = "/redirected"
     link = "/resource"
     with start_server(
-        Response(link, 301, {"Location": redirected}), 
+        Response(link, 301, {"Location": redirected}),
         Response(redirected, 200, {})) as url:
         fmt = "before %s after"
         line = fmt % url(link)