[Checkins] SVN: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/ Get rid of some code duplication that was introduced when grok still depended

[Philipp von Weitershausen]

Log message for revision 79249:
  Get rid of some code duplication that was introduced when grok still depended
  on Zope 3.3.
  

Changed:
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/security/xmlrpc.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py
  D   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc_helper.py

-=-
Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/security/xmlrpc.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/security/xmlrpc.py	2007-08-25 06:11:05 UTC (rev 79248)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/security/xmlrpc.py	2007-08-25 11:26:56 UTC (rev 79249)
@@ -1,6 +1,5 @@
 """
-  >>> from grok.ftests.xmlrpc_helper import ServerProxy
-
+  >>> from zope.app.testing.xmlrpc import ServerProxy
   >>> server = ServerProxy("http://localhost/")
   >>> mgr_server = ServerProxy("http://mgr:mgrpw@localhost/")
 

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py	2007-08-25 06:11:05 UTC (rev 79248)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py	2007-08-25 11:26:56 UTC (rev 79249)
@@ -2,9 +2,9 @@
   >>> from grok.ftests.xmlrpc.xmlrpc import Mammoth
   >>> getRootFolder()["Manfred"] = Mammoth()
 
-  >>> from grok.ftests.xmlrpc_helper import ServerProxy
+  >>> from zope.app.testing.xmlrpc import ServerProxy
+  >>> server = ServerProxy("http://localhost/")
 
-  >>> server = ServerProxy("http://localhost/")
   >>> server.Manfred.stomp()
   'Manfred stomped.'
   >>> server.Manfred.dance()

Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc_helper.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc_helper.py	2007-08-25 06:11:05 UTC (rev 79248)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc_helper.py	2007-08-25 11:26:56 UTC (rev 79249)
@@ -1,77 +0,0 @@
-# XXX This code is duplicated from Zope 3 trunk (future Zope 3.4) as we want to
-# stay compatible with Zope 3.3
-#
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""XMLRPC testing helpers for Zope 3.
-
-$Id$
-"""
-
-import StringIO
-import xmlrpclib 
-
-from zope.app.testing.functional import HTTPCaller
-
-
-class ZopeTestTransport(xmlrpclib.Transport):
-    """xmlrpclib transport that delegates to
-    zope.app.testing.functional.HTTPCaller.
-
-    It can be used like a normal transport, including support for basic
-    authentication.
-    """
-
-    verbose = False
-    handleErrors = True
-
-    def request(self, host, handler, request_body, verbose=0):
-        request = "POST %s HTTP/1.0\n" % (handler,)
-        request += "Content-Length: %i\n" % len(request_body)
-        request += "Content-Type: text/xml\n"
-
-        host, extra_headers, x509 = self.get_host_info(host)
-        if extra_headers:
-            request += "Authorization: %s\n" \
-                       % (dict(extra_headers)["Authorization"],)
-
-        request += "\n" + request_body
-        response = HTTPCaller()(request, handle_errors=self.handleErrors)
-
-        errcode = response.getStatus()
-        errmsg = response.getStatusString()
-        # This is not the same way that the normal transport deals
-        # with the headers.
-        headers = response.getHeaders()
-
-        if errcode != 200:
-            raise xmlrpclib.ProtocolError(
-                host + handler,
-                errcode, errmsg,
-                headers
-                )
-
-        return self._parse_response(
-            StringIO.StringIO(response.getBody()), sock=None)
-
-
-def ServerProxy(uri, transport=ZopeTestTransport(), encoding=None,
-                verbose=0, allow_none=0, handleErrors=True):
-    """A factory that creates a server proxy using the ZopeTestTransport
-    by default.
-    
-    """
-    if isinstance(transport, ZopeTestTransport):
-        transport.handleErrors = handleErrors
-    return xmlrpclib.ServerProxy(uri, transport, encoding, verbose, allow_none)