[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server - ServerChannelBase.py:1.1.4.2 TaskThreads.py:1.1.2.10

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/Server
In directory cvs.zope.org:/tmp/cvs-serv5490/lib/python/Zope/Server

Modified Files:
      Tag: Zope-3x-branch
	ServerChannelBase.py TaskThreads.py 
Log Message:
Implemented 

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/IContainerPythonification

Along the way:

- Converted most uses of has_key to use in.

- Fixed a bug in Interface names and namesAndDescriptions methods 
  that caused base class attributes to be missed.



=== Zope3/lib/python/Zope/Server/ServerChannelBase.py 1.1.4.1 => 1.1.4.2 ===
         ac = self.__class__.active_channels
         fd = self._fileno
-        if ac.has_key(fd):
+        if fd in ac:
             del ac[fd]
 
 


=== Zope3/lib/python/Zope/Server/TaskThreads.py 1.1.2.9 => 1.1.2.10 ===
             while running < count:
                 # Start threads.
-                while threads.has_key(thread_no):
+                while thread_no in threads:
                     thread_no = thread_no + 1
                 threads[thread_no] = 1
                 running += 1