[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/ Merge

[Stephan Richter]

Log message for revision 38389:
  Merge
  
  r30062 | srichter | 2005-04-20 12:56:03 -0400 (Wed, 20 Apr 2005) | 3 lines
  
  Remove requirement for zope.server
  
  

Changed:
  A   Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/demofs.py
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/test_ftpview.py

-=-
Copied: Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/demofs.py (from rev 30062, Zope3/branches/srichter-twisted-integration/src/zope/app/ftp/tests/demofs.py)


Property changes on: Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/demofs.py
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/test_ftpview.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/test_ftpview.py	2005-09-08 12:44:44 UTC (rev 38388)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/ftp/tests/test_ftpview.py	2005-09-08 12:48:30 UTC (rev 38389)
@@ -21,8 +21,6 @@
 
 from zope.interface import implements
 
-import zope.server.ftp.tests.demofs as demofs
-
 from zope.app.testing import ztapi
 from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
 from zope.app.filerepresentation.interfaces import IReadDirectory
@@ -38,6 +36,8 @@
 from zope.app.container.contained import setitem, Contained
 from zope.app.container.interfaces import IContainer
 
+import demofs
+
 class Directory(demofs.Directory, Contained):
 
     implements(IReadDirectory, IWriteDirectory, IFileFactory,