Skip to content

Commit b9b13dd

Browse files
authored
Merge pull request #74 from python-hyper/assertequal
Use assertEqual(), not assertEquals(), which is deprecated.
2 parents 09b60a4 + c64a950 commit b9b13dd

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

hyperlink/test/test_url.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -947,65 +947,65 @@ def test_invalid_port(self):
947947

948948
def test_idna(self):
949949
u1 = URL.from_text('http://bücher.ch')
950-
self.assertEquals(u1.host, 'bücher.ch')
951-
self.assertEquals(u1.to_text(), 'http://bücher.ch')
952-
self.assertEquals(u1.to_uri().to_text(), 'http://xn--bcher-kva.ch')
950+
self.assertEqual(u1.host, 'bücher.ch')
951+
self.assertEqual(u1.to_text(), 'http://bücher.ch')
952+
self.assertEqual(u1.to_uri().to_text(), 'http://xn--bcher-kva.ch')
953953

954954
u2 = URL.from_text('https://xn--bcher-kva.ch')
955-
self.assertEquals(u2.host, 'xn--bcher-kva.ch')
956-
self.assertEquals(u2.to_text(), 'https://xn--bcher-kva.ch')
957-
self.assertEquals(u2.to_iri().to_text(), u'https://bücher.ch')
955+
self.assertEqual(u2.host, 'xn--bcher-kva.ch')
956+
self.assertEqual(u2.to_text(), 'https://xn--bcher-kva.ch')
957+
self.assertEqual(u2.to_iri().to_text(), u'https://bücher.ch')
958958

959959
def test_netloc_slashes(self):
960960
# basic sanity checks
961961
url = URL.from_text('mailto:mahmoud@hatnote.com')
962-
self.assertEquals(url.scheme, 'mailto')
963-
self.assertEquals(url.to_text(), 'mailto:mahmoud@hatnote.com')
962+
self.assertEqual(url.scheme, 'mailto')
963+
self.assertEqual(url.to_text(), 'mailto:mahmoud@hatnote.com')
964964

965965
url = URL.from_text('http://hatnote.com')
966-
self.assertEquals(url.scheme, 'http')
967-
self.assertEquals(url.to_text(), 'http://hatnote.com')
966+
self.assertEqual(url.scheme, 'http')
967+
self.assertEqual(url.to_text(), 'http://hatnote.com')
968968

969969
# test that unrecognized schemes stay consistent with '//'
970970
url = URL.from_text('newscheme:a:b:c')
971-
self.assertEquals(url.scheme, 'newscheme')
972-
self.assertEquals(url.to_text(), 'newscheme:a:b:c')
971+
self.assertEqual(url.scheme, 'newscheme')
972+
self.assertEqual(url.to_text(), 'newscheme:a:b:c')
973973

974974
url = URL.from_text('newerscheme://a/b/c')
975-
self.assertEquals(url.scheme, 'newerscheme')
976-
self.assertEquals(url.to_text(), 'newerscheme://a/b/c')
975+
self.assertEqual(url.scheme, 'newerscheme')
976+
self.assertEqual(url.to_text(), 'newerscheme://a/b/c')
977977

978978
# test that reasonable guesses are made
979979
url = URL.from_text('git+ftp://gitstub.biz/glyph/lefkowitz')
980-
self.assertEquals(url.scheme, 'git+ftp')
981-
self.assertEquals(url.to_text(),
980+
self.assertEqual(url.scheme, 'git+ftp')
981+
self.assertEqual(url.to_text(),
982982
'git+ftp://gitstub.biz/glyph/lefkowitz')
983983

984984
url = URL.from_text('what+mailto:freerealestate@enotuniq.org')
985-
self.assertEquals(url.scheme, 'what+mailto')
986-
self.assertEquals(url.to_text(),
985+
self.assertEqual(url.scheme, 'what+mailto')
986+
self.assertEqual(url.to_text(),
987987
'what+mailto:freerealestate@enotuniq.org')
988988

989989
url = URL(scheme='ztp', path=('x', 'y', 'z'), rooted=True)
990-
self.assertEquals(url.to_text(), 'ztp:/x/y/z')
990+
self.assertEqual(url.to_text(), 'ztp:/x/y/z')
991991

992992
# also works when the input doesn't include '//'
993993
url = URL(scheme='git+ftp', path=('x', 'y', 'z' ,''),
994994
rooted=True, uses_netloc=True)
995995
# broken bc urlunsplit
996-
self.assertEquals(url.to_text(), 'git+ftp:///x/y/z/')
996+
self.assertEqual(url.to_text(), 'git+ftp:///x/y/z/')
997997

998998
# really why would this ever come up but ok
999999
url = URL.from_text('file:///path/to/heck')
10001000
url2 = url.replace(scheme='mailto')
1001-
self.assertEquals(url2.to_text(), 'mailto:/path/to/heck')
1001+
self.assertEqual(url2.to_text(), 'mailto:/path/to/heck')
10021002

10031003
url_text = 'unregisteredscheme:///a/b/c'
10041004
url = URL.from_text(url_text)
10051005
no_netloc_url = url.replace(uses_netloc=False)
1006-
self.assertEquals(no_netloc_url.to_text(), 'unregisteredscheme:/a/b/c')
1006+
self.assertEqual(no_netloc_url.to_text(), 'unregisteredscheme:/a/b/c')
10071007
netloc_url = url.replace(uses_netloc=True)
1008-
self.assertEquals(netloc_url.to_text(), url_text)
1008+
self.assertEqual(netloc_url.to_text(), url_text)
10091009

10101010
return
10111011

0 commit comments

Comments
 (0)