[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/ Recorder tests now pass.

[Stephan Richter]

Log message for revision 38399:
  Recorder tests now pass.
  

Changed:
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/__init__.py
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/tests.py

-=-
Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/__init__.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/__init__.py	2005-09-08 13:54:03 UTC (rev 38398)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/__init__.py	2005-09-08 13:54:18 UTC (rev 38399)
@@ -30,7 +30,7 @@
 from ZODB.POSException import ConflictError
 from BTrees.IOBTree import IOBTree
 from zope.app import wsgi
-from zope.app.server.server import ServerType
+from zope.app.twisted.server import ServerType
 
 class RecordingProtocol(policies.ProtocolWrapper):
     """A special protocol that keeps track of all input and output of an HTTP

Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/tests.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/tests.py	2005-09-08 13:54:03 UTC (rev 38398)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/recorder/tests.py	2005-09-08 13:54:18 UTC (rev 38399)
@@ -54,7 +54,6 @@
       >>> recording.dataReceived('GET / HTTP/1.1\n\n')
       >>> recording.dataReceived('hello world!\n')
 
->>>>>>> .merge-right.r30049
     then the result is immediately available in the ``input`` attribute:
 
       >>> print recording.input.getvalue()