[Zope3-checkins] CVS: Zope3/src/zope/server - __init__.py:1.1.2.3 fixedstreamreceiver.py:1.1.2.3 serverbase.py:1.1.2.3 zlogintegration.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/server
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/server

Modified Files:
      Tag: NameGeddon-branch
	__init__.py fixedstreamreceiver.py serverbase.py 
	zlogintegration.py 
Log Message:
Searched for and changed over 1200 references to Zope.something.

Most of these were either comments, doc strings, or permission ids.

Many were imports or ids in zcml.  (much zcml fixup is still needed.



=== Zope3/src/zope/server/__init__.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/server/__init__.py:1.1.2.2	Mon Dec 23 16:45:27 2002
+++ Zope3/src/zope/server/__init__.py	Tue Dec 24 07:51:30 2002
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Zope.Server package.
+"""
 
 $Id$
 """


=== Zope3/src/zope/server/fixedstreamreceiver.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/server/fixedstreamreceiver.py:1.1.2.2	Mon Dec 23 16:45:27 2002
+++ Zope3/src/zope/server/fixedstreamreceiver.py	Tue Dec 24 07:51:30 2002
@@ -23,19 +23,15 @@
 
     __implements__ = IStreamConsumer
 
-    # See Zope.Server.IStreamConsumer.IStreamConsumer
+    # See IStreamConsumer
     completed = 0
 
     def __init__(self, cl, buf):
         self.remain = cl
         self.buf = buf
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.Server.IStreamConsumer
-
     def received(self, data):
-        'See Zope.Server.IStreamConsumer.IStreamConsumer'
+        'See IStreamConsumer'
         rm = self.remain
         if rm < 1:
             self.completed = 1  # Avoid any chance of spinning
@@ -50,9 +46,6 @@
             self.buf.append(data)
             self.remain -= datalen
             return datalen
-
-    #
-    ############################################################
 
     def getfile(self):
         return self.buf.getfile()


=== Zope3/src/zope/server/serverbase.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/server/serverbase.py:1.1.2.2	Mon Dec 23 16:45:27 2002
+++ Zope3/src/zope/server/serverbase.py	Tue Dec 24 07:51:30 2002
@@ -32,7 +32,7 @@
     __implements__ = asyncore.dispatcher.__implements__, IServer
 
     channel_class = None    # Override with a channel class.
-    SERVER_IDENT = 'Zope.Server.ServerBase'  # Override.
+    SERVER_IDENT = 'zope.server.serverbase'  # Override.
 
     def __init__(self, ip, port, task_dispatcher=None, adj=None, start=1,
                  hit_log=None, verbose=0):
@@ -106,32 +106,25 @@
         else:
             task.service()
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.Server.IDispatcher.IDispatcher
-
     def readable(self):
-        'See Zope.Server.IDispatcher.IDispatcher'
+        'See IDispatcher'
         return (self.accepting and
                 len(asyncore.socket_map) < self.adj.connection_limit)
 
     def writable(self):
-        'See Zope.Server.IDispatcher.IDispatcher'
+        'See IDispatcher'
         return 0
 
-    ######################################
-    # from: Zope.Server.IDispatcherEventHandler.IDispatcherEventHandler
-
     def handle_read(self):
-        'See Zope.Server.IDispatcherEventHandler.IDispatcherEventHandler'
+        'See IDispatcherEventHandler'
         pass
 
     def handle_connect(self):
-        'See Zope.Server.IDispatcherEventHandler.IDispatcherEventHandler'
+        'See IDispatcherEventHandler'
         pass
 
     def handle_accept(self):
-        'See Zope.Server.IDispatcherEventHandler.IDispatcherEventHandler'
+        'See IDispatcherEventHandler'
         try:
             v = self.accept()
             if v is None:
@@ -147,7 +140,4 @@
                                'warning')
             return
         self.channel_class(self, conn, addr, self.adj)
-
-    #
-    ############################################################
 


=== Zope3/src/zope/server/zlogintegration.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/zlogintegration.py:1.1.2.1	Mon Dec 23 14:33:18 2002
+++ Zope3/src/zope/server/zlogintegration.py	Tue Dec 24 07:51:30 2002
@@ -21,7 +21,7 @@
 
 import logging
 
-logger = logging.getLogger("Zope.Server")
+logger = logging.getLogger("zope.server")
 
 severity = {
     'info': logging.INFO,