[Checkins] SVN: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/ unittest deprecation warnings cured
Andrey Lebedev
cvs-admin at zope.org
Thu Feb 21 13:02:45 UTC 2013
Log message for revision 129562:
unittest deprecation warnings cured
Changed:
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestiapplicationrequest.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestipublicationrequest.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserlanguages.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserresponse.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_http.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_principallogging.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py
-=-
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestiapplicationrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestiapplicationrequest.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestiapplicationrequest.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -53,4 +53,4 @@
# Now make sure that request.get can actually deal with return
# self back to us correctly:
- self.assert_(request.get('REQUEST') is request)
+ self.assertTrue(request.get('REQUEST') is request)
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestipublicationrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestipublicationrequest.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/basetestipublicationrequest.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -58,15 +58,15 @@
rcresource2 = sys.getrefcount(resource2)
request.hold(resource2)
- self.failUnless(sys.getrefcount(resource) > rcresource)
- self.failUnless(sys.getrefcount(resource2) > rcresource2)
- self.failIf(resource2.released)
+ self.assertTrue(sys.getrefcount(resource) > rcresource)
+ self.assertTrue(sys.getrefcount(resource2) > rcresource2)
+ self.assertFalse(resource2.released)
request.close()
- self.failUnless(resource2.released)
+ self.assertTrue(resource2.released)
# Responses are not unreferenced during close()
- self.failUnless(sys.getrefcount(response) >= rcresponse)
+ self.assertTrue(sys.getrefcount(response) >= rcresponse)
self.assertEqual(sys.getrefcount(resource), rcresource)
self.assertEqual(sys.getrefcount(resource2), rcresource2)
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserlanguages.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserlanguages.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserlanguages.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -60,7 +60,7 @@
return CacheableBrowserLanguages(request)
def test_cached_languages(self):
- eq = self.failUnlessEqual
+ eq = self.assertEqual
request = TestRequest("da, en, pt")
browser_languages = self.factory(request)
eq(list(browser_languages.getPreferredLanguages()), ["da", "en", "pt"])
@@ -73,12 +73,12 @@
return ModifiableBrowserLanguages(request)
def test_setPreferredLanguages(self):
- eq = self.failUnlessEqual
+ eq = self.assertEqual
request = TestRequest("da, en, pt")
browser_languages = self.factory(request)
eq(list(browser_languages.getPreferredLanguages()), ["da", "en", "pt"])
browser_languages.setPreferredLanguages(["ru", "en"])
- self.failUnless(request.localized)
+ self.assertTrue(request.localized)
eq(list(browser_languages.getPreferredLanguages()), ["ru", "en"])
def test_conflicting_adapters(self):
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -149,7 +149,7 @@
def testTraversalToItem(self):
res = self._publisherResults()
- self.failUnlessEqual(
+ self.assertEqual(
res,
"Status: 200 Ok\r\n"
"Content-Length: 6\r\n"
@@ -163,7 +163,7 @@
request = self._createRequest()
response = request.response
publish(request)
- self.failIf(response.getBase())
+ self.assertFalse(response.getBase())
def testDefault(self):
extra = {'PATH_INFO': '/folder/item2'}
@@ -211,11 +211,11 @@
request = self._createRequest(extra, body=LARGE_FILE_BODY)
request.processInputs()
- self.assert_(request.form['upload'].name)
+ self.assertTrue(request.form['upload'].name)
request = self._createRequest(extra, body=IE_FILE_BODY)
request.processInputs()
- self.assertEquals(request.form['upload'].filename, 'notepad.exe')
+ self.assertEqual(request.form['upload'].filename, 'notepad.exe')
def testDefault2(self):
@@ -231,14 +231,14 @@
request = self._createRequest(extra)
response = request.response
publish(request)
- self.failIf(response.getBase())
+ self.assertFalse(response.getBase())
def testDefault4(self):
extra = {'PATH_INFO': '/folder/item2/view/'}
request = self._createRequest(extra)
response = request.response
publish(request)
- self.failIf(response.getBase())
+ self.assertFalse(response.getBase())
def testDefault6(self):
extra = {'PATH_INFO': '/folder/item2/'}
@@ -275,7 +275,7 @@
# many mainstream browsers do not send HTTP_ACCEPT_CHARSET
del request._environ['HTTP_ACCEPT_CHARSET']
publish(request)
- self.assert_(isinstance(request.form[u'street'], unicode))
+ self.assertTrue(isinstance(request.form[u'street'], unicode))
self.assertEqual(u'K\xf6hlerstra\xdfe', request.form['street'])
def testFormAcceptsStarButNotUTF8(self):
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserresponse.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserresponse.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserresponse.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -35,7 +35,7 @@
<blah>
</html>
""")
- self.assert_(response.getHeader('content-type').startswith("text/html")
+ self.assertTrue(response.getHeader('content-type').startswith("text/html")
)
response = BrowserResponse()
@@ -45,7 +45,7 @@
<blah>
</html>
""")
- self.assert_(response.getHeader('content-type').startswith("text/html")
+ self.assertTrue(response.getHeader('content-type').startswith("text/html")
)
response = BrowserResponse()
@@ -55,7 +55,7 @@
<blah>
</html>
""")
- self.assert_(response.getHeader('content-type').startswith("text/html")
+ self.assertTrue(response.getHeader('content-type').startswith("text/html")
)
response = BrowserResponse()
@@ -66,14 +66,14 @@
<blah>
</html>
""")
- self.assert_(response.getHeader('content-type').startswith("text/html")
+ self.assertTrue(response.getHeader('content-type').startswith("text/html")
)
response = BrowserResponse()
response.setResult(
"""Hello world
""")
- self.assert_(response.getHeader('content-type').startswith(
+ self.assertTrue(response.getHeader('content-type').startswith(
"text/plain")
)
@@ -81,7 +81,7 @@
response.setResult(
"""<p>Hello world
""")
- self.assert_(
+ self.assertTrue(
response.getHeader('content-type').startswith("text/plain")
)
@@ -106,22 +106,22 @@
# Make sure that bases are inserted
response.setBase('http://localhost/folder/')
- self.assert_(
+ self.assertTrue(
b'<base href="http://localhost/folder/" />' in
insertBase(b'<html><head></head><body>Page</body></html>'))
# Ensure that unicode bases work as well
response.setBase(u'http://localhost/folder/')
body = insertBase(b'<html><head></head><body>Page</body></html>')
- self.assert_(isinstance(body, bytes))
- self.assert_(b'<base href="http://localhost/folder/" />' in body)
+ self.assertTrue(isinstance(body, bytes))
+ self.assertTrue(b'<base href="http://localhost/folder/" />' in body)
# Ensure that encoded bodies work, when a base is inserted.
response.setBase('http://localhost/folder')
result = insertBase(
b'<html><head></head><body>\xc3\x9bung</body></html>')
- self.assert_(isinstance(body, bytes))
- self.assert_(b'<base href="http://localhost/folder" />' in result)
+ self.assertTrue(isinstance(body, bytes))
+ self.assertTrue(b'<base href="http://localhost/folder" />' in result)
def testInsertBaseInSetResultUpdatesContentLength(self):
# Make sure that the Content-Length header is updated to account
@@ -137,7 +137,7 @@
</html>
"""
response.setResult(html_page)
- self.assertEquals(
+ self.assertEqual(
int(response.getHeader('content-length')),
len(html_page) + len(inserted_text))
@@ -155,10 +155,10 @@
exc_info = sys.exc_info()
response.handleException(exc_info)
- self.assertEquals(response.getHeader("content-type"),
+ self.assertEqual(response.getHeader("content-type"),
"text/html;charset=utf-8")
- self.assertEquals(response.getStatus(), 500)
- self.assert_(response.consumeBody() in
+ self.assertEqual(response.getStatus(), 500)
+ self.assertTrue(response.consumeBody() in
[b"<html><head><title><type 'exceptions.ValueError'></title></head>\n"
b"<body><h2><type 'exceptions.ValueError'></h2>\n"
b"A server error occurred.\n"
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_http.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_http.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_http.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -132,19 +132,19 @@
# HTTPInputStream understands both CONTENT_LENGTH...
stream = HTTPInputStream(BytesIO(data), {'CONTENT_LENGTH': '100000'})
- self.assert_(isinstance(stream.getCacheStream(), TempFileType))
+ self.assertTrue(isinstance(stream.getCacheStream(), TempFileType))
# ... and HTTP_CONTENT_LENGTH.
stream = HTTPInputStream(BytesIO(data), {'HTTP_CONTENT_LENGTH':
'100000'})
- self.assert_(isinstance(stream.getCacheStream(), TempFileType))
+ self.assertTrue(isinstance(stream.getCacheStream(), TempFileType))
# If CONTENT_LENGTH is absent or empty, it takes the value
# given in HTTP_CONTENT_LENGTH:
stream = HTTPInputStream(BytesIO(data),
{'CONTENT_LENGTH': '',
'HTTP_CONTENT_LENGTH': '100000'})
- self.assert_(isinstance(stream.getCacheStream(), TempFileType))
+ self.assertTrue(isinstance(stream.getCacheStream(), TempFileType))
# In fact, HTTPInputStream can be instantiated with both an
# empty CONTENT_LENGTH and an empty HTTP_CONTENT_LENGTH:
@@ -169,7 +169,7 @@
return b'a'*size
stream = HTTPInputStream(NonClosingStream(), {'CONTENT_LENGTH': '10'})
- self.assertEquals(stream.getCacheStream().read(), b'aaaaaaaaaa')
+ self.assertEqual(stream.getCacheStream().read(), b'aaaaaaaaaa')
stream = HTTPInputStream(NonClosingStream(), {})
self.assertRaises(ServerHung, stream.getCacheStream)
@@ -256,7 +256,7 @@
def testTraversalToItem(self):
res = self._publisherResults()
- self.failUnlessEqual(
+ self.assertEqual(
res,
"Status: 200 Ok\r\n"
"Content-Length: 6\r\n"
@@ -270,27 +270,27 @@
request = self._createRequest(env, b'')
location = request.response.redirect('http://foobar.com/redirected')
- self.assertEquals(location, 'http://foobar.com/redirected')
- self.assertEquals(request.response.getStatus(), 302)
- self.assertEquals(request.response.getHeader('location'), location)
+ self.assertEqual(location, 'http://foobar.com/redirected')
+ self.assertEqual(request.response.getStatus(), 302)
+ self.assertEqual(request.response.getHeader('location'), location)
# test HTTP/1.1
env = {'SERVER_PROTOCOL':'HTTP/1.1'}
request = self._createRequest(env, b'')
location = request.response.redirect('http://foobar.com/redirected')
- self.assertEquals(request.response.getStatus(), 303)
+ self.assertEqual(request.response.getStatus(), 303)
# test explicit status
request = self._createRequest(env, b'')
request.response.redirect('http://foobar.com/explicit', 304)
- self.assertEquals(request.response.getStatus(), 304)
+ self.assertEqual(request.response.getStatus(), 304)
# test non-string location, like URLGetter
request = self._createRequest(env, b'')
request.response.redirect(request.URL)
- self.assertEquals(request.response.getStatus(), 303)
- self.assertEquals(request.response.getHeader('location'),
+ self.assertEqual(request.response.getStatus(), 303)
+ self.assertEqual(request.response.getHeader('location'),
str(request.URL))
def testUntrustedRedirect(self):
@@ -305,81 +305,81 @@
# host. They aren't really allowed per RFC but the response object
# supports them and people are probably using them.
location = request.response.redirect('/foo', trusted=False)
- self.assertEquals('/foo', location)
+ self.assertEqual('/foo', location)
# If we pass `trusted` for the redirect, we can redirect the browser
# anywhere we want, though.
location = request.response.redirect(
'http://my-friends.com', trusted=True)
- self.assertEquals('http://my-friends.com', location)
+ self.assertEqual('http://my-friends.com', location)
# We can redirect to our own full server URL, with or without a port
# being specified. Let's explicitly set a host name to test this is
# this is how virtual hosting works:
request.setApplicationServer('example.com')
location = request.response.redirect('http://example.com')
- self.assertEquals('http://example.com', location)
+ self.assertEqual('http://example.com', location)
request.setApplicationServer('example.com', port=8080)
location = request.response.redirect('http://example.com:8080')
- self.assertEquals('http://example.com:8080', location)
+ self.assertEqual('http://example.com:8080', location)
# The default port for HTTP and HTTPS may be omitted:
request.setApplicationServer('example.com')
location = request.response.redirect('http://example.com:80')
- self.assertEquals('http://example.com:80', location)
+ self.assertEqual('http://example.com:80', location)
request.setApplicationServer('example.com', port=80)
location = request.response.redirect('http://example.com')
- self.assertEquals('http://example.com', location)
+ self.assertEqual('http://example.com', location)
request.setApplicationServer('example.com', 'https')
location = request.response.redirect('https://example.com:443')
- self.assertEquals('https://example.com:443', location)
+ self.assertEqual('https://example.com:443', location)
request.setApplicationServer('example.com', 'https', 443)
location = request.response.redirect('https://example.com')
- self.assertEquals('https://example.com', location)
+ self.assertEqual('https://example.com', location)
def testUnregisteredStatus(self):
# verify we can set the status to an unregistered int value
request = self._createRequest({}, b'')
request.response.setStatus(289)
- self.assertEquals(request.response.getStatus(), 289)
+ self.assertEqual(request.response.getStatus(), 289)
def testRequestEnvironment(self):
req = self._createRequest()
publish(req, handle_errors=0) # Force expansion of URL variables
- self.assertEquals(str(req.URL), 'http://foobar.com/folder/item')
- self.assertEquals(req.URL['-1'], 'http://foobar.com/folder')
- self.assertEquals(req.URL['-2'], 'http://foobar.com')
+ self.assertEqual(str(req.URL), 'http://foobar.com/folder/item')
+ self.assertEqual(req.URL['-1'], 'http://foobar.com/folder')
+ self.assertEqual(req.URL['-2'], 'http://foobar.com')
self.assertRaises(KeyError, req.URL.__getitem__, '-3')
- self.assertEquals(req.URL['0'], 'http://foobar.com')
- self.assertEquals(req.URL['1'], 'http://foobar.com/folder')
- self.assertEquals(req.URL['2'], 'http://foobar.com/folder/item')
+ self.assertEqual(req.URL['0'], 'http://foobar.com')
+ self.assertEqual(req.URL['1'], 'http://foobar.com/folder')
+ self.assertEqual(req.URL['2'], 'http://foobar.com/folder/item')
self.assertRaises(KeyError, req.URL.__getitem__, '3')
- self.assertEquals(req.URL.get('0'), 'http://foobar.com')
- self.assertEquals(req.URL.get('1'), 'http://foobar.com/folder')
- self.assertEquals(req.URL.get('2'), 'http://foobar.com/folder/item')
- self.assertEquals(req.URL.get('3', 'none'), 'none')
+ self.assertEqual(req.URL.get('0'), 'http://foobar.com')
+ self.assertEqual(req.URL.get('1'), 'http://foobar.com/folder')
+ self.assertEqual(req.URL.get('2'), 'http://foobar.com/folder/item')
+ self.assertEqual(req.URL.get('3', 'none'), 'none')
- self.assertEquals(req['SERVER_URL'], 'http://foobar.com')
- self.assertEquals(req['HTTP_HOST'], 'foobar.com')
- self.assertEquals(req['PATH_INFO'], '/folder/item')
- self.assertEquals(req['CONTENT_LENGTH'], '0')
+ self.assertEqual(req['SERVER_URL'], 'http://foobar.com')
+ self.assertEqual(req['HTTP_HOST'], 'foobar.com')
+ self.assertEqual(req['PATH_INFO'], '/folder/item')
+ self.assertEqual(req['CONTENT_LENGTH'], '0')
self.assertRaises(KeyError, req.__getitem__, 'HTTP_AUTHORIZATION')
- self.assertEquals(req['GATEWAY_INTERFACE'], 'TestFooInterface/1.0')
- self.assertEquals(req['HTTP_OFF_THE_WALL'], "Spam 'n eggs")
+ self.assertEqual(req['GATEWAY_INTERFACE'], 'TestFooInterface/1.0')
+ self.assertEqual(req['HTTP_OFF_THE_WALL'], "Spam 'n eggs")
self.assertRaises(KeyError, req.__getitem__,
'HTTP_WE_DID_NOT_PROVIDE_THIS')
def testRequestLocale(self):
eq = self.assertEqual
- unless = self.failUnless
+ unless = self.assertTrue
from zope.publisher.browser import BrowserLanguages
from zope.publisher.interfaces.http import IHTTPRequest
@@ -452,17 +452,17 @@
}
req = self._createRequest(extra_env=cookies)
- self.assertEquals(req.cookies[u'foo'], u'bar')
- self.assertEquals(req[u'foo'], u'bar')
+ self.assertEqual(req.cookies[u'foo'], u'bar')
+ self.assertEqual(req[u'foo'], u'bar')
- self.assertEquals(req.cookies[u'spam'], u'eggs')
- self.assertEquals(req[u'spam'], u'eggs')
+ self.assertEqual(req.cookies[u'spam'], u'eggs')
+ self.assertEqual(req[u'spam'], u'eggs')
- self.assertEquals(req.cookies[u'this'], u'Should be accepted')
- self.assertEquals(req[u'this'], u'Should be accepted')
+ self.assertEqual(req.cookies[u'this'], u'Should be accepted')
+ self.assertEqual(req[u'this'], u'Should be accepted')
# Reserved key
- self.failIf(req.cookies.has_key('path'))
+ self.assertFalse(req.cookies.has_key('path'))
def testCookieErrorToLog(self):
cookies = {
@@ -471,23 +471,23 @@
}
req = self._createRequest(extra_env=cookies)
- self.failIf(req.cookies.has_key('foo'))
- self.failIf(req.has_key('foo'))
+ self.assertFalse(req.cookies.has_key('foo'))
+ self.assertFalse(req.has_key('foo'))
- self.failIf(req.cookies.has_key('spam'))
- self.failIf(req.has_key('spam'))
+ self.assertFalse(req.cookies.has_key('spam'))
+ self.assertFalse(req.has_key('spam'))
- self.failIf(req.cookies.has_key('ldap/OU'))
- self.failIf(req.has_key('ldap/OU'))
+ self.assertFalse(req.cookies.has_key('ldap/OU'))
+ self.assertFalse(req.has_key('ldap/OU'))
# Reserved key
- self.failIf(req.cookies.has_key('path'))
+ self.assertFalse(req.cookies.has_key('path'))
def testCookiesUnicode(self):
# Cookie values are assumed to be UTF-8 encoded
cookies = {'HTTP_COOKIE': r'key="\342\230\243";'}
req = self._createRequest(extra_env=cookies)
- self.assertEquals(req.cookies[u'key'], u'\N{BIOHAZARD SIGN}')
+ self.assertEqual(req.cookies[u'key'], u'\N{BIOHAZARD SIGN}')
def testHeaders(self):
headers = {
@@ -495,13 +495,13 @@
'Another-Test': 'another',
}
req = self._createRequest(extra_env=headers)
- self.assertEquals(req.headers[u'TEST_HEADER'], u'test')
- self.assertEquals(req.headers[u'TEST-HEADER'], u'test')
- self.assertEquals(req.headers[u'test_header'], u'test')
- self.assertEquals(req.getHeader('TEST_HEADER', literal=True), u'test')
- self.assertEquals(req.getHeader('TEST-HEADER', literal=True), None)
- self.assertEquals(req.getHeader('test_header', literal=True), None)
- self.assertEquals(req.getHeader('Another-Test', literal=True),
+ self.assertEqual(req.headers[u'TEST_HEADER'], u'test')
+ self.assertEqual(req.headers[u'TEST-HEADER'], u'test')
+ self.assertEqual(req.headers[u'test_header'], u'test')
+ self.assertEqual(req.getHeader('TEST_HEADER', literal=True), u'test')
+ self.assertEqual(req.getHeader('TEST-HEADER', literal=True), None)
+ self.assertEqual(req.getHeader('test_header', literal=True), None)
+ self.assertEqual(req.getHeader('Another-Test', literal=True),
'another')
def testBasicAuth(self):
@@ -510,19 +510,19 @@
req = self._createRequest()
verifyObject(IHTTPCredentials, req)
lpq = req._authUserPW()
- self.assertEquals(lpq, None)
+ self.assertEqual(lpq, None)
env = {}
login, password = (b"tim", b"123:456")
s = base64.b64encode(b':'.join((login, password)))
env['HTTP_AUTHORIZATION'] = "Basic %s" % s.decode('ascii')
req = self._createRequest(env)
lpw = req._authUserPW()
- self.assertEquals(lpw, (login, password))
+ self.assertEqual(lpw, (login, password))
def testSetPrincipal(self):
req = self._createRequest()
req.setPrincipal(UserStub("jim"))
- self.assertEquals(req.response.authUser, 'jim')
+ self.assertEqual(req.response.authUser, 'jim')
def test_method(self):
r = self._createRequest(extra_env={'REQUEST_METHOD':'SPAM'})
@@ -535,25 +535,25 @@
zope.event.subscribers.append(events.append)
req = self._createRequest()
req.setApplicationServer('foo')
- self.assertEquals(req._app_server, 'http://foo')
+ self.assertEqual(req._app_server, 'http://foo')
req.setApplicationServer('foo', proto='https')
- self.assertEquals(req._app_server, 'https://foo')
+ self.assertEqual(req._app_server, 'https://foo')
req.setApplicationServer('foo', proto='https', port=8080)
- self.assertEquals(req._app_server, 'https://foo:8080')
+ self.assertEqual(req._app_server, 'https://foo:8080')
req.setApplicationServer('foo', proto='http', port='9673')
- self.assertEquals(req._app_server, 'http://foo:9673')
+ self.assertEqual(req._app_server, 'http://foo:9673')
req.setApplicationServer('foo', proto='https', port=443)
- self.assertEquals(req._app_server, 'https://foo')
+ self.assertEqual(req._app_server, 'https://foo')
req.setApplicationServer('foo', proto='https', port='443')
- self.assertEquals(req._app_server, 'https://foo')
+ self.assertEqual(req._app_server, 'https://foo')
req.setApplicationServer('foo', port=80)
- self.assertEquals(req._app_server, 'http://foo')
+ self.assertEqual(req._app_server, 'http://foo')
req.setApplicationServer('foo', proto='telnet', port=80)
- self.assertEquals(req._app_server, 'telnet://foo:80')
+ self.assertEqual(req._app_server, 'telnet://foo:80')
zope.event.subscribers.pop()
- self.assertEquals(len(events), 8)
+ self.assertEqual(len(events), 8)
for event in events:
- self.assertEquals(event.request, req)
+ self.assertEqual(event.request, req)
def test_setApplicationNames(self):
events = []
@@ -561,12 +561,12 @@
req = self._createRequest()
names = ['x', 'y', 'z']
req.setVirtualHostRoot(names)
- self.assertEquals(req._app_names, ['x', 'y', 'z'])
+ self.assertEqual(req._app_names, ['x', 'y', 'z'])
names[0] = 'muahahahaha'
- self.assertEquals(req._app_names, ['x', 'y', 'z'])
+ self.assertEqual(req._app_names, ['x', 'y', 'z'])
zope.event.subscribers.pop()
- self.assertEquals(len(events), 1)
- self.assertEquals(events[0].request, req)
+ self.assertEqual(len(events), 1)
+ self.assertEqual(events[0].request, req)
def test_setVirtualHostRoot(self):
events = []
@@ -575,22 +575,22 @@
req._traversed_names = ['x', 'y']
req._last_obj_traversed = object()
req.setVirtualHostRoot()
- self.failIf(req._traversed_names)
- self.assertEquals(req._vh_root, req._last_obj_traversed)
+ self.assertFalse(req._traversed_names)
+ self.assertEqual(req._vh_root, req._last_obj_traversed)
zope.event.subscribers.pop()
- self.assertEquals(len(events), 1)
- self.assertEquals(events[0].request, req)
+ self.assertEqual(len(events), 1)
+ self.assertEqual(events[0].request, req)
def test_getVirtualHostRoot(self):
req = self._createRequest()
- self.assertEquals(req.getVirtualHostRoot(), None)
+ self.assertEqual(req.getVirtualHostRoot(), None)
req._vh_root = object()
- self.assertEquals(req.getVirtualHostRoot(), req._vh_root)
+ self.assertEqual(req.getVirtualHostRoot(), req._vh_root)
def test_traverse(self):
req = self._createRequest()
req.traverse(self.app)
- self.assertEquals(req._traversed_names, ['folder', 'item'])
+ self.assertEqual(req._traversed_names, ['folder', 'item'])
# setting it during traversal matters
req = self._createRequest()
@@ -599,8 +599,8 @@
req.setVirtualHostRoot()
req.publication.callTraversalHooks = hook
req.traverse(self.app)
- self.assertEquals(req._traversed_names, ['item'])
- self.assertEquals(req._vh_root, self.app.folder)
+ self.assertEqual(req._traversed_names, ['item'])
+ self.assertEqual(req._vh_root, self.app.folder)
def test_traverseDuplicateHooks(self):
"""
@@ -625,7 +625,7 @@
req.setPublication(publication)
req.setTraversalStack(req.getTraversalStack() + ["vh"])
req.traverse(self.app)
- self.assertEquals(len(hooks), 3)
+ self.assertEqual(len(hooks), 3)
def testInterface(self):
from zope.publisher.interfaces.http import IHTTPCredentials
@@ -639,21 +639,21 @@
req = self._createRequest()
deduceServerURL = req._HTTPRequest__deduceServerURL
req._environ = {'HTTP_HOST': 'example.com:80'}
- self.assertEquals(deduceServerURL(), 'http://example.com')
+ self.assertEqual(deduceServerURL(), 'http://example.com')
req._environ = {'HTTP_HOST': 'example.com:8080'}
- self.assertEquals(deduceServerURL(), 'http://example.com:8080')
+ self.assertEqual(deduceServerURL(), 'http://example.com:8080')
req._environ = {'HTTP_HOST': 'example.com:443', 'HTTPS': 'on'}
- self.assertEquals(deduceServerURL(), 'https://example.com')
+ self.assertEqual(deduceServerURL(), 'https://example.com')
req._environ = {'HTTP_HOST': 'example.com:80', 'HTTPS': 'ON'}
- self.assertEquals(deduceServerURL(), 'https://example.com:80')
+ self.assertEqual(deduceServerURL(), 'https://example.com:80')
req._environ = {'HTTP_HOST': 'example.com:8080',
'SERVER_PORT_SECURE': '1'}
- self.assertEquals(deduceServerURL(), 'https://example.com:8080')
+ self.assertEqual(deduceServerURL(), 'https://example.com:8080')
req._environ = {'SERVER_NAME': 'example.com', 'SERVER_PORT':'8080',
'SERVER_PORT_SECURE': '0'}
- self.assertEquals(deduceServerURL(), 'http://example.com:8080')
+ self.assertEqual(deduceServerURL(), 'http://example.com:8080')
req._environ = {'SERVER_NAME': 'example.com'}
- self.assertEquals(deduceServerURL(), 'http://example.com')
+ self.assertEqual(deduceServerURL(), 'http://example.com')
def testUnicodeURLs(self):
# The request expects PATH_INFO to be utf-8 encoded when it gets it.
@@ -687,10 +687,10 @@
request.response.setResult(result)
body = request.response.consumeBody()
- self.assertEquals(request.response.getStatus(), 200)
- self.assertEquals(request.response.getHeader('Content-Type'),
+ self.assertEqual(request.response.getStatus(), 200)
+ self.assertEqual(request.response.getHeader('Content-Type'),
'text/plain;charset=utf-8')
- self.assertEquals(body,
+ self.assertEqual(body,
b'Latin a with ogonek\xc4\x85 Cyrillic ya \xd1\x8f')
class ConcreteHTTPTests(HTTPTests):
@@ -709,7 +709,7 @@
r = self._createRequest(extra_env={"PATH_INFO": "/xxx"})
publish(r, handle_errors=0)
r.shiftNameToApplication()
- self.assertEquals(r.getApplicationURL(), appurl+"/xxx")
+ self.assertEqual(r.getApplicationURL(), appurl+"/xxx")
# Verify that we can only shift if we've traversed only a single name
r = self._createRequest(extra_env={"PATH_INFO": "/folder/item"})
@@ -760,10 +760,10 @@
self.assertEqual(body, data)
# Make sure that no Content-Length header was added
- self.assert_('Content-Length' not in headers)
+ self.assertTrue('Content-Length' not in headers)
def testContentLength(self):
- eq = self.failUnlessEqual
+ eq = self.assertEqual
headers, body = self._getResultFromResponse("test", "utf-8",
{"content-type": "text/plain"})
@@ -777,7 +777,7 @@
eq(b'\xd1\x82\xd0\xb5\xd1\x81\xd1\x82', body)
def testContentType(self):
- eq = self.failUnlessEqual
+ eq = self.assertEqual
headers, body = self._getResultFromResponse(b"test", "utf-8")
eq("", headers.get("Content-Type", ""))
@@ -851,20 +851,20 @@
c = self._getCookieFromResponse([
('foo', 'bar', {}),
])
- self.failUnless('foo=bar;' in c or 'foo=bar' in c,
+ self.assertTrue('foo=bar;' in c or 'foo=bar' in c,
'foo=bar; not in %r' % c)
c = self._getCookieFromResponse([
('foo', 'bar', {}),
('alpha', 'beta', {}),
])
- self.failUnless('foo=bar;' in c or 'foo=bar' in c)
- self.failUnless('alpha=beta;' in c or 'alpha=beta' in c)
+ self.assertTrue('foo=bar;' in c or 'foo=bar' in c)
+ self.assertTrue('alpha=beta;' in c or 'alpha=beta' in c)
c = self._getCookieFromResponse([
('sign', u'\N{BIOHAZARD SIGN}', {}),
])
- self.failUnless((r'sign="\342\230\243";' in c) or
+ self.assertTrue((r'sign="\342\230\243";' in c) or
(r'sign="\342\230\243"' in c))
self.assertRaises(
@@ -883,17 +883,17 @@
'seCure': True,
}),
])[0]
- self.failUnless('foo=bar;' in c or 'foo=bar' in c)
- self.failUnless('expires=Sat, 12 Jul 2014 23:26:28 GMT;' in c, repr(c))
- self.failUnless('Domain=example.com;' in c)
- self.failUnless('Path=/froboz;' in c)
- self.failUnless('Max-Age=3600;' in c)
- self.failUnless('Comment=blah%3B%E2%98%A3?;' in c, repr(c))
- self.failUnless('secure;' in c or 'secure' in c)
+ self.assertTrue('foo=bar;' in c or 'foo=bar' in c)
+ self.assertTrue('expires=Sat, 12 Jul 2014 23:26:28 GMT;' in c, repr(c))
+ self.assertTrue('Domain=example.com;' in c)
+ self.assertTrue('Path=/froboz;' in c)
+ self.assertTrue('Max-Age=3600;' in c)
+ self.assertTrue('Comment=blah%3B%E2%98%A3?;' in c, repr(c))
+ self.assertTrue('secure;' in c or 'secure' in c)
c = self._getCookieFromResponse([('foo', 'bar', {'secure': False})])[0]
- self.failUnless('foo=bar;' in c or 'foo=bar' in c)
- self.failIf('secure' in c)
+ self.assertTrue('foo=bar;' in c or 'foo=bar' in c)
+ self.assertFalse('secure' in c)
def test_handleException(self):
response = HTTPResponse()
@@ -903,10 +903,10 @@
exc_info = sys.exc_info()
response.handleException(exc_info)
- self.assertEquals(response.getHeader("content-type"),
+ self.assertEqual(response.getHeader("content-type"),
"text/html;charset=utf-8")
- self.assertEquals(response.getStatus(), 500)
- self.assert_(response.consumeBody() in
+ self.assertEqual(response.getStatus(), 500)
+ self.assertTrue(response.consumeBody() in
[b"<html><head>"
b"<title><type 'exceptions.ValueError'></title></head>\n"
b"<body><h2><type 'exceptions.ValueError'></h2>\n"
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -25,10 +25,10 @@
return '%d%d%d' % (a, b, c)
values = {'a':2, 'b':3, 'c':5}
v = mapply(compute, (), values)
- self.failUnlessEqual(v, '235')
+ self.assertEqual(v, '235')
v = mapply(compute, (7,), values)
- self.failUnlessEqual(v, '735')
+ self.assertEqual(v, '735')
def testClass(self):
values = {'a':2, 'b':3, 'c':5}
@@ -39,11 +39,11 @@
compute = __call__
cc = c()
v = mapply(cc, (), values)
- self.failUnlessEqual(v, '335')
+ self.assertEqual(v, '335')
del values['c']
v = mapply(cc.compute, (), values)
- self.failUnlessEqual(v, '334')
+ self.assertEqual(v, '334')
def testClassicClass(self):
if not PYTHON2:
@@ -64,7 +64,7 @@
c2inst = c2()
c2inst.__call__ = cc
v = mapply(c2inst, (), values)
- self.failUnlessEqual(v, '334')
+ self.assertEqual(v, '334')
def test_suite():
loader = unittest.TestLoader()
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_principallogging.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_principallogging.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_principallogging.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -35,7 +35,7 @@
from zope.publisher.principallogging import PrincipalLogging
principal = PrincipalStub()
pl = PrincipalLogging(principal)
- self.assertEquals(pl.getLogMessage(), '\\xfc principal')
+ self.assertEqual(pl.getLogMessage(), '\\xfc principal')
def test_suite():
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -86,7 +86,7 @@
provided=IReRaiseException)
def testImplementsIPublication(self):
- self.failUnless(IPublication.providedBy(
+ self.assertTrue(IPublication.providedBy(
DefaultPublication(self.app)))
def testInterfacesVerify(self):
@@ -95,11 +95,11 @@
def testTraversalToItem(self):
res = self._publisherResults('/folder/item')
- self.failUnlessEqual(res, 'item')
+ self.assertEqual(res, 'item')
res = self._publisherResults('/folder/item/')
- self.failUnlessEqual(res, 'item')
+ self.assertEqual(res, 'item')
res = self._publisherResults('folder/item')
- self.failUnlessEqual(res, 'item')
+ self.assertEqual(res, 'item')
def testUnderscoreUnauthorizedException(self):
self.assertRaises(Unauthorized, self._publisherResults, '/_item')
@@ -134,7 +134,7 @@
except:
pass
self._unregisterExcAdapter(doReRaiseAdapter)
- self.failUnlessEqual(raised, True)
+ self.assertEqual(raised, True)
def testRetryErrorIsUnwrapped(self):
test = self
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py 2013-02-21 12:38:23 UTC (rev 129561)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py 2013-02-21 13:02:45 UTC (rev 129562)
@@ -118,15 +118,15 @@
def testProcessInput(self):
req = self._createRequest({}, xmlrpc_call)
req.processInputs()
- self.failUnlessEqual(req.getPositionalArguments(), (1,))
- self.failUnlessEqual(tuple(req._path_suffix), ('action',))
+ self.assertEqual(req.getPositionalArguments(), (1,))
+ self.assertEqual(tuple(req._path_suffix), ('action',))
def testTraversal(self):
req = self._createRequest({}, xmlrpc_call)
req.processInputs()
action = req.traverse(self.app)
- self.failUnlessEqual(action(*req.getPositionalArguments()),
+ self.assertEqual(action(*req.getPositionalArguments()),
"Parameter[type: int; value: 1")
More information about the checkins
mailing list