[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/VFS - VFSRequest.py:1.1.2.4

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/VFS
In directory cvs.zope.org:/tmp/cvs-serv25892/lib/python/Zope/Publisher/VFS

Modified Files:
      Tag: Zope3-Server-Branch
	VFSRequest.py 
Log Message:
Wee, quiet a bit of changes, but they fix and finnish the stuff Shane did
earlier today.

- Removed a lot of old files and moved some to more appropriate places. The 
  removal of the Suthentication directory is probably the biggest one. I
  also deleted all the other FileSystem types, like MSDOS and Unix, since 
  the FielSystem is not returning formatted lists anymore. Yipee!

- Fixed PublisherFTPServer, so it works with Shane's new Credentials 
  interfaces. Everything should be working fine again.

- Fixed the POP3 and SMTP code to work with the new model. It all works 
  really well. I hope that Gerson Kurz will take over this development 
  soon. I also contacted authors of other server protocols, and they might
  join. Rich Salz is already writing a method for ZSI, so that we can 
  insert SOAP in the next days.

- Made most tests run again and updated them. I still have one error. I know
  why it is caused, but I do not know how to correct. I know it is a test 
  environment problem though, not a code one.



=== Zope3/lib/python/Zope/Publisher/VFS/VFSRequest.py 1.1.2.3 => 1.1.2.4 ===
     def _authUserPW(self):
         'See Zope.Publisher.VFS.IVFSCredentials.IVFSCredentials'
-        env = self._environ
-        return env['username'], env['password']
+        credentials = self._environ['credentials']
+        return credentials.getUserName(), credentials.getPassword()
 
     def unauthorized(self, challenge):
         'See Zope.Publisher.VFS.IVFSCredentials.IVFSCredentials'