@@ -1179,15 +1179,15 @@ def test_errors(self):
11791179 r = MockResponse (200 , "OK" , {}, "" , url )
11801180 newr = h .http_response (req , r )
11811181 self .assertIs (r , newr )
1182- self .assertFalse ( hasattr ( o , "proto" ) ) # o.error not called
1182+ self .assertNotHasAttr ( o , "proto" ) # o.error not called
11831183 r = MockResponse (202 , "Accepted" , {}, "" , url )
11841184 newr = h .http_response (req , r )
11851185 self .assertIs (r , newr )
1186- self .assertFalse ( hasattr ( o , "proto" ) ) # o.error not called
1186+ self .assertNotHasAttr ( o , "proto" ) # o.error not called
11871187 r = MockResponse (206 , "Partial content" , {}, "" , url )
11881188 newr = h .http_response (req , r )
11891189 self .assertIs (r , newr )
1190- self .assertFalse ( hasattr ( o , "proto" ) ) # o.error not called
1190+ self .assertNotHasAttr ( o , "proto" ) # o.error not called
11911191 # anything else calls o.error (and MockOpener returns None, here)
11921192 r = MockResponse (502 , "Bad gateway" , {}, "" , url )
11931193 self .assertIsNone (h .http_response (req , r ))
@@ -1402,7 +1402,7 @@ def http_open(self, req):
14021402 response = opener .open ('http://example.com/' )
14031403 expected = b'GET ' + result + b' '
14041404 request = handler .last_buf
1405- self .assertTrue (request . startswith ( expected ), repr ( request ) )
1405+ self .assertStartsWith (request , expected )
14061406
14071407 def test_redirect_head_request (self ):
14081408 from_url = "http://example.com/a.html"
@@ -1892,9 +1892,9 @@ def test_HTTPError_interface(self):
18921892 url = code = fp = None
18931893 hdrs = 'Content-Length: 42'
18941894 err = urllib .error .HTTPError (url , code , msg , hdrs , fp )
1895- self .assertTrue ( hasattr ( err , 'reason' ) )
1895+ self .assertHasAttr ( err , 'reason' )
18961896 self .assertEqual (err .reason , 'something bad happened' )
1897- self .assertTrue ( hasattr ( err , 'headers' ) )
1897+ self .assertHasAttr ( err , 'headers' )
18981898 self .assertEqual (err .headers , 'Content-Length: 42' )
18991899 expected_errmsg = 'HTTP Error %s: %s' % (err .code , err .msg )
19001900 self .assertEqual (str (err ), expected_errmsg )
0 commit comments