renamed getRequestPublication() to just __call__()

zopefoundation · Oct 7, 2005 · 6166246 · 6166246
1 parent 1fbf340
commit 6166246
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/interfaces.py b/interfaces.py
@@ -115,5 +115,5 @@ def canHandle(environment):
             to make a decision based on the HTTP headers.
         """
 
-    def getRequestPublication():
+    def __call__():
         """ returns a tuple (request, publication) """
diff --git a/publicationfactories.py b/publicationfactories.py
@@ -40,7 +40,7 @@ def canHandle(self, environment):
         self.soap_req = component.queryUtility(interfaces.ISOAPRequestFactory)
         return bool(environment.get('HTTP_SOAPACTION') and self.soap_req)
 
-    def getRequestPublication(self):
+    def __call__(self):
         return self.soap_req, SOAPPublication
 
 
@@ -51,7 +51,7 @@ class XMLRPCFactory(object):
     def canHandle(self, environment):
         return True
 
-    def getRequestPublication(self):
+    def __call__(self):
         request_class = component.queryUtility(
             interfaces.IXMLRPCRequestFactory, default=XMLRPCRequest)
         return request_class, XMLRPCPublication
@@ -64,7 +64,7 @@ class HTTPFactory(object):
     def canHandle(self, environment):
         return True
 
-    def getRequestPublication(self):
+    def __call__(self):
         request_class = component.queryUtility(
             interfaces.IHTTPRequestFactory, default=HTTPRequest)
         return request_class, HTTPPublication
@@ -76,7 +76,7 @@ class BrowserFactory(object):
     def canHandle(self, environment):
         return True
 
-    def getRequestPublication(self):
+    def __call__(self):
         request_class = component.queryUtility(
                 interfaces.IBrowserRequestFactory, default=BrowserRequest)
         return request_class, BrowserPublication

diff --git a/tests/test_publicationfactories.py b/tests/test_publicationfactories.py
@@ -66,7 +66,7 @@ def test_soapfactory(self):
         self.assertEqual(factory.canHandle(env), False)
         env['HTTP_SOAPACTION'] = 'server:foo'
         self.assertEqual(factory.canHandle(env), True)
-        request, publication = factory.getRequestPublication()
+        request, publication = factory()
         self.assertEqual(isinstance(request, DummyRequestFactory), True)
         self.assertEqual(publication, SOAPPublication)
 
@@ -78,7 +78,7 @@ def test_xmlrpcfactory(self):
         env = self.__env
         factory = XMLRPCFactory()
         self.assertEqual(factory.canHandle(env), True)
-        request, publication = factory.getRequestPublication()
+        request, publication = factory()
         self.assertEqual(isinstance(request, DummyRequestFactory), True)
         self.assertEqual(publication, XMLRPCPublication)
 
@@ -90,7 +90,7 @@ def test_httpfactory(self):
         env = self.__env
         factory = HTTPFactory()
         self.assertEqual(factory.canHandle(env), True)
-        request, publication = factory.getRequestPublication()
+        request, publication = factory()
         self.assertEqual(isinstance(request, DummyRequestFactory), True)
         self.assertEqual(publication, HTTPPublication)
 
@@ -102,7 +102,7 @@ def test_browserfactory(self):
         env = self.__env
         factory = BrowserFactory()
         self.assertEqual(factory.canHandle(env), True)
-        request, publication = factory.getRequestPublication()
+        request, publication = factory()
         self.assertEqual(isinstance(request, DummyRequestFactory), True)
         self.assertEqual(publication, BrowserPublication)