Author: chrisz
Date: Thu Mar 8 07:50:13 2012
New Revision: 8229
Log:
The callMethodOfServlet() method should not be a static method.
Modified:
Webware/trunk/WebKit/HTTPContent.py
Webware/trunk/WebKit/Testing/IncludeURLTest.py
Modified: Webware/trunk/WebKit/HTTPContent.py
==============================================================================
--- Webware/trunk/WebKit/HTTPContent.py Wed Mar 7 12:14:22 2012 (r8228)
+++ Webware/trunk/WebKit/HTTPContent.py Thu Mar 8 07:50:13 2012 (r8229)
@@ -309,8 +309,7 @@
"""
self.application().includeURL(self.transaction(), url)
- @staticmethod
- def callMethodOfServlet(url, method, *args, **kwargs):
+ def callMethodOfServlet(self, url, method, *args, **kwargs):
"""Call a method of another servlet.
See `Application.callMethodOfServlet` for details.
@@ -321,7 +320,8 @@
return self.application().callMethodOfServlet(
self.transaction(), url, method, *args, **kwargs)
- def endResponse(self):
+ @staticmethod
+ def endResponse():
"""End response.
When this method is called during `awake` or `respond`,
Modified: Webware/trunk/WebKit/Testing/IncludeURLTest.py
==============================================================================
--- Webware/trunk/WebKit/Testing/IncludeURLTest.py Wed Mar 7 12:14:22 2012 (r8228)
+++ Webware/trunk/WebKit/Testing/IncludeURLTest.py Thu Mar 8 07:50:13 2012 (r8229)
@@ -98,12 +98,11 @@
def cmos(self, url, method, desc):
app = self.application()
- trans = self.transaction()
self.writeln('<p>Calling'
' <tt>callMethodOfServlet(t, "%s", "%s")</tt>:</p>'
'<p>%s</p>' % (url, method, desc))
self.write('<div style="margin-left:2em">')
- ret = app.callMethodOfServlet(trans, url, method)
+ ret = self.callMethodOfServlet(url, method)
self.write('</div>')
self.writeln('<p><tt>callMethodOfServlet</tt> returned %s.</p>'
% (ret is not None and '<tt>%s</tt>'
|