Module is part of the name - url.decode, not url.urldecode

A pattern we need to use far more often in the codebase

1 files changed, 20 insertions, 20 deletions

diff --git a/test/netlib/http/test_url.py b/test/netlib/http/test_url.py
index d777a949..697c83a8 100644
--- a/test/netlib/http/test_url.py
+++ b/test/netlib/http/test_url.py
@@ -1,65 +1,65 @@
 from netlib import tutils
 from netlib.http import url
 
-def test_parse_url():
+def test_parse():
     with tutils.raises(ValueError):
-        url.parse_url("")
+        url.parse("")
 
-    s, h, po, pa = url.parse_url(b"http://foo.com:8888/test")
+    s, h, po, pa = url.parse(b"http://foo.com:8888/test")
     assert s == b"http"
     assert h == b"foo.com"
     assert po == 8888
     assert pa == b"/test"
 
-    s, h, po, pa = url.parse_url("http://foo/bar")
+    s, h, po, pa = url.parse("http://foo/bar")
     assert s == b"http"
     assert h == b"foo"
     assert po == 80
     assert pa == b"/bar"
 
-    s, h, po, pa = url.parse_url(b"http://user:pass@foo/bar")
+    s, h, po, pa = url.parse(b"http://user:pass@foo/bar")
     assert s == b"http"
     assert h == b"foo"
     assert po == 80
     assert pa == b"/bar"
 
-    s, h, po, pa = url.parse_url(b"http://foo")
+    s, h, po, pa = url.parse(b"http://foo")
     assert pa == b"/"
 
-    s, h, po, pa = url.parse_url(b"https://foo")
+    s, h, po, pa = url.parse(b"https://foo")
     assert po == 443
 
     with tutils.raises(ValueError):
-        url.parse_url(b"https://foo:bar")
+        url.parse(b"https://foo:bar")
 
     # Invalid IDNA
     with tutils.raises(ValueError):
-        url.parse_url("http://\xfafoo")
+        url.parse("http://\xfafoo")
     # Invalid PATH
     with tutils.raises(ValueError):
-        url.parse_url("http:/\xc6/localhost:56121")
+        url.parse("http:/\xc6/localhost:56121")
     # Null byte in host
     with tutils.raises(ValueError):
-        url.parse_url("http://foo\0")
+        url.parse("http://foo\0")
     # Port out of range
-    _, _, port, _ = url.parse_url("http://foo:999999")
+    _, _, port, _ = url.parse("http://foo:999999")
     assert port == 80
     # Invalid IPv6 URL - see http://www.ietf.org/rfc/rfc2732.txt
     with tutils.raises(ValueError):
-        url.parse_url('http://lo[calhost')
+        url.parse('http://lo[calhost')
 
 
-def test_unparse_url():
-    assert url.unparse_url("http", "foo.com", 99, "") == "http://foo.com:99"
-    assert url.unparse_url("http", "foo.com", 80, "/bar") == "http://foo.com/bar"
-    assert url.unparse_url("https", "foo.com", 80, "") == "https://foo.com:80"
-    assert url.unparse_url("https", "foo.com", 443, "") == "https://foo.com"
+def test_unparse():
+    assert url.unparse("http", "foo.com", 99, "") == "http://foo.com:99"
+    assert url.unparse("http", "foo.com", 80, "/bar") == "http://foo.com/bar"
+    assert url.unparse("https", "foo.com", 80, "") == "https://foo.com:80"
+    assert url.unparse("https", "foo.com", 443, "") == "https://foo.com"
 
 
 def test_urlencode():
-    assert url.urlencode([('foo', 'bar')])
+    assert url.encode([('foo', 'bar')])
 
 
 def test_urldecode():
     s = "one=two&three=four"
-    assert len(url.urldecode(s)) == 2
+    assert len(url.decode(s)) == 2