untabify

ZServer/medusa/m_syslog.py

@@ -68,144 +68,144 @@ Usage:
 #
 # priorities (these are ordered)
 
-LOG_EMERG		= 0		#  system is unusable 
-LOG_ALERT		= 1		#  action must be taken immediately 
-LOG_CRIT		= 2		#  critical conditions 
-LOG_ERR			= 3		#  error conditions 
-LOG_WARNING		= 4		#  warning conditions 
-LOG_NOTICE		= 5		#  normal but significant condition 
-LOG_INFO		= 6		#  informational 
-LOG_DEBUG		= 7		#  debug-level messages 
+LOG_EMERG       = 0     #  system is unusable 
+LOG_ALERT       = 1     #  action must be taken immediately 
+LOG_CRIT        = 2     #  critical conditions 
+LOG_ERR         = 3     #  error conditions 
+LOG_WARNING     = 4     #  warning conditions 
+LOG_NOTICE      = 5     #  normal but significant condition 
+LOG_INFO        = 6     #  informational 
+LOG_DEBUG       = 7     #  debug-level messages 
 
 #  facility codes 
-LOG_KERN		= 0		#  kernel messages 
-LOG_USER		= 1		#  random user-level messages 
-LOG_MAIL		= 2		#  mail system 
-LOG_DAEMON		= 3		#  system daemons 
-LOG_AUTH		= 4		#  security/authorization messages 
-LOG_SYSLOG		= 5		#  messages generated internally by syslogd 
-LOG_LPR			= 6		#  line printer subsystem 
-LOG_NEWS		= 7		#  network news subsystem 
-LOG_UUCP		= 8		#  UUCP subsystem 
-LOG_CRON		= 9		#  clock daemon 
-LOG_AUTHPRIV	= 10	#  security/authorization messages (private) 
+LOG_KERN        = 0     #  kernel messages 
+LOG_USER        = 1     #  random user-level messages 
+LOG_MAIL        = 2     #  mail system 
+LOG_DAEMON      = 3     #  system daemons 
+LOG_AUTH        = 4     #  security/authorization messages 
+LOG_SYSLOG      = 5     #  messages generated internally by syslogd 
+LOG_LPR         = 6     #  line printer subsystem 
+LOG_NEWS        = 7     #  network news subsystem 
+LOG_UUCP        = 8     #  UUCP subsystem 
+LOG_CRON        = 9     #  clock daemon 
+LOG_AUTHPRIV    = 10    #  security/authorization messages (private) 
 
 #  other codes through 15 reserved for system use 
-LOG_LOCAL0		= 16		#  reserved for local use 
-LOG_LOCAL1		= 17		#  reserved for local use 
-LOG_LOCAL2		= 18		#  reserved for local use 
-LOG_LOCAL3		= 19		#  reserved for local use 
-LOG_LOCAL4		= 20		#  reserved for local use 
-LOG_LOCAL5		= 21		#  reserved for local use 
-LOG_LOCAL6		= 22		#  reserved for local use 
-LOG_LOCAL7		= 23		#  reserved for local use 
+LOG_LOCAL0      = 16        #  reserved for local use 
+LOG_LOCAL1      = 17        #  reserved for local use 
+LOG_LOCAL2      = 18        #  reserved for local use 
+LOG_LOCAL3      = 19        #  reserved for local use 
+LOG_LOCAL4      = 20        #  reserved for local use 
+LOG_LOCAL5      = 21        #  reserved for local use 
+LOG_LOCAL6      = 22        #  reserved for local use 
+LOG_LOCAL7      = 23        #  reserved for local use 
 
 priority_names = {
-	"alert":	LOG_ALERT,
-	"crit":		LOG_CRIT,
-	"debug":	LOG_DEBUG,
-	"emerg":	LOG_EMERG,
-	"err":		LOG_ERR,
-	"error":	LOG_ERR,		#  DEPRECATED 
-	"info":		LOG_INFO,
-	"notice":	LOG_NOTICE,
-	"panic": 	LOG_EMERG,		#  DEPRECATED 
-	"warn":		LOG_WARNING,		#  DEPRECATED 
-	"warning":	LOG_WARNING,
-	}
+    "alert":    LOG_ALERT,
+    "crit":     LOG_CRIT,
+    "debug":    LOG_DEBUG,
+    "emerg":    LOG_EMERG,
+    "err":      LOG_ERR,
+    "error":    LOG_ERR,        #  DEPRECATED 
+    "info":     LOG_INFO,
+    "notice":   LOG_NOTICE,
+    "panic":    LOG_EMERG,      #  DEPRECATED 
+    "warn":     LOG_WARNING,        #  DEPRECATED 
+    "warning":  LOG_WARNING,
+    }
 
 facility_names = {
-	"auth":		LOG_AUTH,
-	"authpriv":	LOG_AUTHPRIV,
-	"cron": 	LOG_CRON,
-	"daemon":	LOG_DAEMON,
-	"kern":		LOG_KERN,
-	"lpr":		LOG_LPR,
-	"mail":		LOG_MAIL,
-	"news":		LOG_NEWS,
-	"security":	LOG_AUTH,		#  DEPRECATED 
-	"syslog":	LOG_SYSLOG,
-	"user":		LOG_USER,
-	"uucp":		LOG_UUCP,
-	"local0":	LOG_LOCAL0,
-	"local1":	LOG_LOCAL1,
-	"local2":	LOG_LOCAL2,
-	"local3":	LOG_LOCAL3,
-	"local4":	LOG_LOCAL4,
-	"local5":	LOG_LOCAL5,
-	"local6":	LOG_LOCAL6,
-	"local7":	LOG_LOCAL7,
-	}
+    "auth":     LOG_AUTH,
+    "authpriv": LOG_AUTHPRIV,
+    "cron":     LOG_CRON,
+    "daemon":   LOG_DAEMON,
+    "kern":     LOG_KERN,
+    "lpr":      LOG_LPR,
+    "mail":     LOG_MAIL,
+    "news":     LOG_NEWS,
+    "security": LOG_AUTH,       #  DEPRECATED 
+    "syslog":   LOG_SYSLOG,
+    "user":     LOG_USER,
+    "uucp":     LOG_UUCP,
+    "local0":   LOG_LOCAL0,
+    "local1":   LOG_LOCAL1,
+    "local2":   LOG_LOCAL2,
+    "local3":   LOG_LOCAL3,
+    "local4":   LOG_LOCAL4,
+    "local5":   LOG_LOCAL5,
+    "local6":   LOG_LOCAL6,
+    "local7":   LOG_LOCAL7,
+    }
 
 import socket
 
 class syslog_client:
-	def __init__ (self, address='/dev/log'):
-		self.address = address
-		if type (address) == type(''):
-			try: # APUE 13.4.2 specifes /dev/log as datagram socket
-			    self.socket = socket.socket( socket.AF_UNIX
+    def __init__ (self, address='/dev/log'):
+        self.address = address
+        if type (address) == type(''):
+            try: # APUE 13.4.2 specifes /dev/log as datagram socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_DGRAM)
-			    self.socket.connect (address)
-			except: # older linux may create as stream socket
-			    self.socket = socket.socket( socket.AF_UNIX
+                self.socket.connect (address)
+            except: # older linux may create as stream socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_STREAM)
-			    self.socket.connect (address)
-			self.unix = 1
-		else:
-			self.socket = socket.socket( socket.AF_INET
+                self.socket.connect (address)
+            self.unix = 1
+        else:
+            self.socket = socket.socket( socket.AF_INET
                                                    , socket.SOCK_DGRAM)
-			self.unix = 0
-
-	# curious: when talking to the unix-domain '/dev/log' socket, a
-	#   zero-terminator seems to be required.  this string is placed
-	#   into a class variable so that it can be overridden if
-	#   necessary.
-
-	log_format_string = '<%d>%s\000'
-
-	def log (self, message, facility=LOG_USER, priority=LOG_INFO):
-		message = self.log_format_string % (
-			self.encode_priority (facility, priority),
-			message
-			)
-		if self.unix:
-			self.socket.send (message)
-		else:
-			self.socket.sendto (message, self.address)
-
-	def encode_priority (self, facility, priority):
-		if type(facility) == type(''):
-			facility = facility_names[facility]
-		if type(priority) == type(''):
-			priority = priority_names[priority]			
-		return (facility<<3) | priority
-
-	def close (self):
-		if self.unix:
-			self.socket.close()
+            self.unix = 0
+
+    # curious: when talking to the unix-domain '/dev/log' socket, a
+    #   zero-terminator seems to be required.  this string is placed
+    #   into a class variable so that it can be overridden if
+    #   necessary.
+
+    log_format_string = '<%d>%s\000'
+
+    def log (self, message, facility=LOG_USER, priority=LOG_INFO):
+        message = self.log_format_string % (
+            self.encode_priority (facility, priority),
+            message
+            )
+        if self.unix:
+            self.socket.send (message)
+        else:
+            self.socket.sendto (message, self.address)
+
+    def encode_priority (self, facility, priority):
+        if type(facility) == type(''):
+            facility = facility_names[facility]
+        if type(priority) == type(''):
+            priority = priority_names[priority]         
+        return (facility<<3) | priority
+
+    def close (self):
+        if self.unix:
+            self.socket.close()
 
 if __name__ == '__main__':
     """
        Unit test for syslog_client.  Set up for the test by:
-	
-	* tail -f /var/log/allstuf (to see the "normal" log messages).
+    
+    * tail -f /var/log/allstuf (to see the "normal" log messages).
 
         * Running the test_logger.py script with a junk file name (which
-	  will be opened as a Unix-domain socket). "Custom" log messages
-	  will go here.
+      will be opened as a Unix-domain socket). "Custom" log messages
+      will go here.
 
-	* Run this script, passing the same junk file name.
+    * Run this script, passing the same junk file name.
 
-	* Check that the "bogus" test throws, and that none of the rest do.
+    * Check that the "bogus" test throws, and that none of the rest do.
 
-	* Check that the 'default' and 'UDP' messages show up in the tail.
+    * Check that the 'default' and 'UDP' messages show up in the tail.
 
-	* Check that the 'non-std' message shows up in the test_logger
-	  console.
+    * Check that the 'non-std' message shows up in the test_logger
+      console.
 
-	* Finally, kill off the tail and test_logger, and clean up the
-	  socket file.
+    * Finally, kill off the tail and test_logger, and clean up the
+      socket file.
     """
     import sys, traceback
 
@@ -215,14 +215,14 @@ if __name__ == '__main__':
 
     def test_client( desc, address=None ):
         try:
-	    if address:
-	        client = syslog_client( address )
-	    else:
-	        client = syslog_client()
+        if address:
+            client = syslog_client( address )
+        else:
+            client = syslog_client()
         except:
-	    print 'syslog_client() [%s] ctor threw' % desc
+        print 'syslog_client() [%s] ctor threw' % desc
             traceback.print_exc()
-	    return
+        return
 
         try:
             client.log( 'testing syslog_client() [%s]' % desc

lib/python/OFS/Image.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Image object"""
 
-__version__='$Revision: 1.101 $'[11:-2]
+__version__='$Revision: 1.102 $'[11:-2]
 
 import Globals, string, struct, content_types
 from OFS.content_types import guess_content_type
@@ -194,12 +194,12 @@ class File(Persistent,Implicit,PropertyManager,
         if header is not None:
             header=string.split(header, ';')[0]
             mod_since=int(DateTime(header).timeTime())
-	    
-	    if self._p_mtime:
+            
+            if self._p_mtime:
                 last_mod = int(self._p_mtime)
-	    else:
-	        last_mod = 0
-		
+            else:
+                last_mod = 0
+                
             if last_mod > 0 and last_mod <= mod_since:
                 RESPONSE.setStatus(304)
                 return RESPONSE

lib/python/ThreadedAsync.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Utility module to help manage the asyncore mainloop in a multi-threaded app
 """
-__version__='$Revision: 1.1 $'[11:-2]
+__version__='$Revision: 1.2 $'[11:-2]
 
 import thread
 import asyncore
@@ -105,7 +105,7 @@ def _start_loop(map):
     try:
         global _looping
         _looping=1
-	while _loop_callbacks:
+        while _loop_callbacks:
             cb, args, kw = _loop_callbacks.pop()
             apply(cb, (map,)+args, kw or {})
 

lib/python/ZLogger/syslog.py

@@ -68,144 +68,144 @@ Usage:
 #
 # priorities (these are ordered)
 
-LOG_EMERG		= 0		#  system is unusable 
-LOG_ALERT		= 1		#  action must be taken immediately 
-LOG_CRIT		= 2		#  critical conditions 
-LOG_ERR			= 3		#  error conditions 
-LOG_WARNING		= 4		#  warning conditions 
-LOG_NOTICE		= 5		#  normal but significant condition 
-LOG_INFO		= 6		#  informational 
-LOG_DEBUG		= 7		#  debug-level messages 
+LOG_EMERG       = 0     #  system is unusable 
+LOG_ALERT       = 1     #  action must be taken immediately 
+LOG_CRIT        = 2     #  critical conditions 
+LOG_ERR         = 3     #  error conditions 
+LOG_WARNING     = 4     #  warning conditions 
+LOG_NOTICE      = 5     #  normal but significant condition 
+LOG_INFO        = 6     #  informational 
+LOG_DEBUG       = 7     #  debug-level messages 
 
 #  facility codes 
-LOG_KERN		= 0		#  kernel messages 
-LOG_USER		= 1		#  random user-level messages 
-LOG_MAIL		= 2		#  mail system 
-LOG_DAEMON		= 3		#  system daemons 
-LOG_AUTH		= 4		#  security/authorization messages 
-LOG_SYSLOG		= 5		#  messages generated internally by syslogd 
-LOG_LPR			= 6		#  line printer subsystem 
-LOG_NEWS		= 7		#  network news subsystem 
-LOG_UUCP		= 8		#  UUCP subsystem 
-LOG_CRON		= 9		#  clock daemon 
-LOG_AUTHPRIV	= 10	#  security/authorization messages (private) 
+LOG_KERN        = 0     #  kernel messages 
+LOG_USER        = 1     #  random user-level messages 
+LOG_MAIL        = 2     #  mail system 
+LOG_DAEMON      = 3     #  system daemons 
+LOG_AUTH        = 4     #  security/authorization messages 
+LOG_SYSLOG      = 5     #  messages generated internally by syslogd 
+LOG_LPR         = 6     #  line printer subsystem 
+LOG_NEWS        = 7     #  network news subsystem 
+LOG_UUCP        = 8     #  UUCP subsystem 
+LOG_CRON        = 9     #  clock daemon 
+LOG_AUTHPRIV    = 10    #  security/authorization messages (private) 
 
 #  other codes through 15 reserved for system use 
-LOG_LOCAL0		= 16		#  reserved for local use 
-LOG_LOCAL1		= 17		#  reserved for local use 
-LOG_LOCAL2		= 18		#  reserved for local use 
-LOG_LOCAL3		= 19		#  reserved for local use 
-LOG_LOCAL4		= 20		#  reserved for local use 
-LOG_LOCAL5		= 21		#  reserved for local use 
-LOG_LOCAL6		= 22		#  reserved for local use 
-LOG_LOCAL7		= 23		#  reserved for local use 
+LOG_LOCAL0      = 16        #  reserved for local use 
+LOG_LOCAL1      = 17        #  reserved for local use 
+LOG_LOCAL2      = 18        #  reserved for local use 
+LOG_LOCAL3      = 19        #  reserved for local use 
+LOG_LOCAL4      = 20        #  reserved for local use 
+LOG_LOCAL5      = 21        #  reserved for local use 
+LOG_LOCAL6      = 22        #  reserved for local use 
+LOG_LOCAL7      = 23        #  reserved for local use 
 
 priority_names = {
-	"alert":	LOG_ALERT,
-	"crit":		LOG_CRIT,
-	"debug":	LOG_DEBUG,
-	"emerg":	LOG_EMERG,
-	"err":		LOG_ERR,
-	"error":	LOG_ERR,		#  DEPRECATED 
-	"info":		LOG_INFO,
-	"notice":	LOG_NOTICE,
-	"panic": 	LOG_EMERG,		#  DEPRECATED 
-	"warn":		LOG_WARNING,		#  DEPRECATED 
-	"warning":	LOG_WARNING,
-	}
+    "alert":    LOG_ALERT,
+    "crit":     LOG_CRIT,
+    "debug":    LOG_DEBUG,
+    "emerg":    LOG_EMERG,
+    "err":      LOG_ERR,
+    "error":    LOG_ERR,        #  DEPRECATED 
+    "info":     LOG_INFO,
+    "notice":   LOG_NOTICE,
+    "panic":    LOG_EMERG,      #  DEPRECATED 
+    "warn":     LOG_WARNING,        #  DEPRECATED 
+    "warning":  LOG_WARNING,
+    }
 
 facility_names = {
-	"auth":		LOG_AUTH,
-	"authpriv":	LOG_AUTHPRIV,
-	"cron": 	LOG_CRON,
-	"daemon":	LOG_DAEMON,
-	"kern":		LOG_KERN,
-	"lpr":		LOG_LPR,
-	"mail":		LOG_MAIL,
-	"news":		LOG_NEWS,
-	"security":	LOG_AUTH,		#  DEPRECATED 
-	"syslog":	LOG_SYSLOG,
-	"user":		LOG_USER,
-	"uucp":		LOG_UUCP,
-	"local0":	LOG_LOCAL0,
-	"local1":	LOG_LOCAL1,
-	"local2":	LOG_LOCAL2,
-	"local3":	LOG_LOCAL3,
-	"local4":	LOG_LOCAL4,
-	"local5":	LOG_LOCAL5,
-	"local6":	LOG_LOCAL6,
-	"local7":	LOG_LOCAL7,
-	}
+    "auth":     LOG_AUTH,
+    "authpriv": LOG_AUTHPRIV,
+    "cron":     LOG_CRON,
+    "daemon":   LOG_DAEMON,
+    "kern":     LOG_KERN,
+    "lpr":      LOG_LPR,
+    "mail":     LOG_MAIL,
+    "news":     LOG_NEWS,
+    "security": LOG_AUTH,       #  DEPRECATED 
+    "syslog":   LOG_SYSLOG,
+    "user":     LOG_USER,
+    "uucp":     LOG_UUCP,
+    "local0":   LOG_LOCAL0,
+    "local1":   LOG_LOCAL1,
+    "local2":   LOG_LOCAL2,
+    "local3":   LOG_LOCAL3,
+    "local4":   LOG_LOCAL4,
+    "local5":   LOG_LOCAL5,
+    "local6":   LOG_LOCAL6,
+    "local7":   LOG_LOCAL7,
+    }
 
 import socket
 
 class syslog_client:
-	def __init__ (self, address='/dev/log'):
-		self.address = address
-		if type (address) == type(''):
-			try: # APUE 13.4.2 specifes /dev/log as datagram socket
-			    self.socket = socket.socket( socket.AF_UNIX
+    def __init__ (self, address='/dev/log'):
+        self.address = address
+        if type (address) == type(''):
+            try: # APUE 13.4.2 specifes /dev/log as datagram socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_DGRAM)
-			    self.socket.connect (address)
-			except: # older linux may create as stream socket
-			    self.socket = socket.socket( socket.AF_UNIX
+                self.socket.connect (address)
+            except: # older linux may create as stream socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_STREAM)
-			    self.socket.connect (address)
-			self.unix = 1
-		else:
-			self.socket = socket.socket( socket.AF_INET
+                self.socket.connect (address)
+            self.unix = 1
+        else:
+            self.socket = socket.socket( socket.AF_INET
                                                    , socket.SOCK_DGRAM)
-			self.unix = 0
-
-	# curious: when talking to the unix-domain '/dev/log' socket, a
-	#   zero-terminator seems to be required.  this string is placed
-	#   into a class variable so that it can be overridden if
-	#   necessary.
-
-	log_format_string = '<%d>%s\000'
-
-	def log (self, message, facility=LOG_USER, priority=LOG_INFO):
-		message = self.log_format_string % (
-			self.encode_priority (facility, priority),
-			message
-			)
-		if self.unix:
-			self.socket.send (message)
-		else:
-			self.socket.sendto (message, self.address)
-
-	def encode_priority (self, facility, priority):
-		if type(facility) == type(''):
-			facility = facility_names[facility]
-		if type(priority) == type(''):
-			priority = priority_names[priority]			
-		return (facility<<3) | priority
-
-	def close (self):
-		if self.unix:
-			self.socket.close()
+            self.unix = 0
+
+    # curious: when talking to the unix-domain '/dev/log' socket, a
+    #   zero-terminator seems to be required.  this string is placed
+    #   into a class variable so that it can be overridden if
+    #   necessary.
+
+    log_format_string = '<%d>%s\000'
+
+    def log (self, message, facility=LOG_USER, priority=LOG_INFO):
+        message = self.log_format_string % (
+            self.encode_priority (facility, priority),
+            message
+            )
+        if self.unix:
+            self.socket.send (message)
+        else:
+            self.socket.sendto (message, self.address)
+
+    def encode_priority (self, facility, priority):
+        if type(facility) == type(''):
+            facility = facility_names[facility]
+        if type(priority) == type(''):
+            priority = priority_names[priority]         
+        return (facility<<3) | priority
+
+    def close (self):
+        if self.unix:
+            self.socket.close()
 
 if __name__ == '__main__':
     """
        Unit test for syslog_client.  Set up for the test by:
-	
-	* tail -f /var/log/allstuf (to see the "normal" log messages).
+    
+    * tail -f /var/log/allstuf (to see the "normal" log messages).
 
         * Running the test_logger.py script with a junk file name (which
-	  will be opened as a Unix-domain socket). "Custom" log messages
-	  will go here.
+      will be opened as a Unix-domain socket). "Custom" log messages
+      will go here.
 
-	* Run this script, passing the same junk file name.
+    * Run this script, passing the same junk file name.
 
-	* Check that the "bogus" test throws, and that none of the rest do.
+    * Check that the "bogus" test throws, and that none of the rest do.
 
-	* Check that the 'default' and 'UDP' messages show up in the tail.
+    * Check that the 'default' and 'UDP' messages show up in the tail.
 
-	* Check that the 'non-std' message shows up in the test_logger
-	  console.
+    * Check that the 'non-std' message shows up in the test_logger
+      console.
 
-	* Finally, kill off the tail and test_logger, and clean up the
-	  socket file.
+    * Finally, kill off the tail and test_logger, and clean up the
+      socket file.
     """
     import sys, traceback
 
@@ -215,14 +215,14 @@ if __name__ == '__main__':
 
     def test_client( desc, address=None ):
         try:
-	    if address:
-	        client = syslog_client( address )
-	    else:
-	        client = syslog_client()
+        if address:
+            client = syslog_client( address )
+        else:
+            client = syslog_client()
         except:
-	    print 'syslog_client() [%s] ctor threw' % desc
+        print 'syslog_client() [%s] ctor threw' % desc
             traceback.print_exc()
-	    return
+        return
 
         try:
             client.log( 'testing syslog_client() [%s]' % desc

lib/python/ZServer/medusa/m_syslog.py

@@ -68,144 +68,144 @@ Usage:
 #
 # priorities (these are ordered)
 
-LOG_EMERG		= 0		#  system is unusable 
-LOG_ALERT		= 1		#  action must be taken immediately 
-LOG_CRIT		= 2		#  critical conditions 
-LOG_ERR			= 3		#  error conditions 
-LOG_WARNING		= 4		#  warning conditions 
-LOG_NOTICE		= 5		#  normal but significant condition 
-LOG_INFO		= 6		#  informational 
-LOG_DEBUG		= 7		#  debug-level messages 
+LOG_EMERG       = 0     #  system is unusable 
+LOG_ALERT       = 1     #  action must be taken immediately 
+LOG_CRIT        = 2     #  critical conditions 
+LOG_ERR         = 3     #  error conditions 
+LOG_WARNING     = 4     #  warning conditions 
+LOG_NOTICE      = 5     #  normal but significant condition 
+LOG_INFO        = 6     #  informational 
+LOG_DEBUG       = 7     #  debug-level messages 
 
 #  facility codes 
-LOG_KERN		= 0		#  kernel messages 
-LOG_USER		= 1		#  random user-level messages 
-LOG_MAIL		= 2		#  mail system 
-LOG_DAEMON		= 3		#  system daemons 
-LOG_AUTH		= 4		#  security/authorization messages 
-LOG_SYSLOG		= 5		#  messages generated internally by syslogd 
-LOG_LPR			= 6		#  line printer subsystem 
-LOG_NEWS		= 7		#  network news subsystem 
-LOG_UUCP		= 8		#  UUCP subsystem 
-LOG_CRON		= 9		#  clock daemon 
-LOG_AUTHPRIV	= 10	#  security/authorization messages (private) 
+LOG_KERN        = 0     #  kernel messages 
+LOG_USER        = 1     #  random user-level messages 
+LOG_MAIL        = 2     #  mail system 
+LOG_DAEMON      = 3     #  system daemons 
+LOG_AUTH        = 4     #  security/authorization messages 
+LOG_SYSLOG      = 5     #  messages generated internally by syslogd 
+LOG_LPR         = 6     #  line printer subsystem 
+LOG_NEWS        = 7     #  network news subsystem 
+LOG_UUCP        = 8     #  UUCP subsystem 
+LOG_CRON        = 9     #  clock daemon 
+LOG_AUTHPRIV    = 10    #  security/authorization messages (private) 
 
 #  other codes through 15 reserved for system use 
-LOG_LOCAL0		= 16		#  reserved for local use 
-LOG_LOCAL1		= 17		#  reserved for local use 
-LOG_LOCAL2		= 18		#  reserved for local use 
-LOG_LOCAL3		= 19		#  reserved for local use 
-LOG_LOCAL4		= 20		#  reserved for local use 
-LOG_LOCAL5		= 21		#  reserved for local use 
-LOG_LOCAL6		= 22		#  reserved for local use 
-LOG_LOCAL7		= 23		#  reserved for local use 
+LOG_LOCAL0      = 16        #  reserved for local use 
+LOG_LOCAL1      = 17        #  reserved for local use 
+LOG_LOCAL2      = 18        #  reserved for local use 
+LOG_LOCAL3      = 19        #  reserved for local use 
+LOG_LOCAL4      = 20        #  reserved for local use 
+LOG_LOCAL5      = 21        #  reserved for local use 
+LOG_LOCAL6      = 22        #  reserved for local use 
+LOG_LOCAL7      = 23        #  reserved for local use 
 
 priority_names = {
-	"alert":	LOG_ALERT,
-	"crit":		LOG_CRIT,
-	"debug":	LOG_DEBUG,
-	"emerg":	LOG_EMERG,
-	"err":		LOG_ERR,
-	"error":	LOG_ERR,		#  DEPRECATED 
-	"info":		LOG_INFO,
-	"notice":	LOG_NOTICE,
-	"panic": 	LOG_EMERG,		#  DEPRECATED 
-	"warn":		LOG_WARNING,		#  DEPRECATED 
-	"warning":	LOG_WARNING,
-	}
+    "alert":    LOG_ALERT,
+    "crit":     LOG_CRIT,
+    "debug":    LOG_DEBUG,
+    "emerg":    LOG_EMERG,
+    "err":      LOG_ERR,
+    "error":    LOG_ERR,        #  DEPRECATED 
+    "info":     LOG_INFO,
+    "notice":   LOG_NOTICE,
+    "panic":    LOG_EMERG,      #  DEPRECATED 
+    "warn":     LOG_WARNING,        #  DEPRECATED 
+    "warning":  LOG_WARNING,
+    }
 
 facility_names = {
-	"auth":		LOG_AUTH,
-	"authpriv":	LOG_AUTHPRIV,
-	"cron": 	LOG_CRON,
-	"daemon":	LOG_DAEMON,
-	"kern":		LOG_KERN,
-	"lpr":		LOG_LPR,
-	"mail":		LOG_MAIL,
-	"news":		LOG_NEWS,
-	"security":	LOG_AUTH,		#  DEPRECATED 
-	"syslog":	LOG_SYSLOG,
-	"user":		LOG_USER,
-	"uucp":		LOG_UUCP,
-	"local0":	LOG_LOCAL0,
-	"local1":	LOG_LOCAL1,
-	"local2":	LOG_LOCAL2,
-	"local3":	LOG_LOCAL3,
-	"local4":	LOG_LOCAL4,
-	"local5":	LOG_LOCAL5,
-	"local6":	LOG_LOCAL6,
-	"local7":	LOG_LOCAL7,
-	}
+    "auth":     LOG_AUTH,
+    "authpriv": LOG_AUTHPRIV,
+    "cron":     LOG_CRON,
+    "daemon":   LOG_DAEMON,
+    "kern":     LOG_KERN,
+    "lpr":      LOG_LPR,
+    "mail":     LOG_MAIL,
+    "news":     LOG_NEWS,
+    "security": LOG_AUTH,       #  DEPRECATED 
+    "syslog":   LOG_SYSLOG,
+    "user":     LOG_USER,
+    "uucp":     LOG_UUCP,
+    "local0":   LOG_LOCAL0,
+    "local1":   LOG_LOCAL1,
+    "local2":   LOG_LOCAL2,
+    "local3":   LOG_LOCAL3,
+    "local4":   LOG_LOCAL4,
+    "local5":   LOG_LOCAL5,
+    "local6":   LOG_LOCAL6,
+    "local7":   LOG_LOCAL7,
+    }
 
 import socket
 
 class syslog_client:
-	def __init__ (self, address='/dev/log'):
-		self.address = address
-		if type (address) == type(''):
-			try: # APUE 13.4.2 specifes /dev/log as datagram socket
-			    self.socket = socket.socket( socket.AF_UNIX
+    def __init__ (self, address='/dev/log'):
+        self.address = address
+        if type (address) == type(''):
+            try: # APUE 13.4.2 specifes /dev/log as datagram socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_DGRAM)
-			    self.socket.connect (address)
-			except: # older linux may create as stream socket
-			    self.socket = socket.socket( socket.AF_UNIX
+                self.socket.connect (address)
+            except: # older linux may create as stream socket
+                self.socket = socket.socket( socket.AF_UNIX
                                                        , socket.SOCK_STREAM)
-			    self.socket.connect (address)
-			self.unix = 1
-		else:
-			self.socket = socket.socket( socket.AF_INET
+                self.socket.connect (address)
+            self.unix = 1
+        else:
+            self.socket = socket.socket( socket.AF_INET
                                                    , socket.SOCK_DGRAM)
-			self.unix = 0
-
-	# curious: when talking to the unix-domain '/dev/log' socket, a
-	#   zero-terminator seems to be required.  this string is placed
-	#   into a class variable so that it can be overridden if
-	#   necessary.
-
-	log_format_string = '<%d>%s\000'
-
-	def log (self, message, facility=LOG_USER, priority=LOG_INFO):
-		message = self.log_format_string % (
-			self.encode_priority (facility, priority),
-			message
-			)
-		if self.unix:
-			self.socket.send (message)
-		else:
-			self.socket.sendto (message, self.address)
-
-	def encode_priority (self, facility, priority):
-		if type(facility) == type(''):
-			facility = facility_names[facility]
-		if type(priority) == type(''):
-			priority = priority_names[priority]			
-		return (facility<<3) | priority
-
-	def close (self):
-		if self.unix:
-			self.socket.close()
+            self.unix = 0
+
+    # curious: when talking to the unix-domain '/dev/log' socket, a
+    #   zero-terminator seems to be required.  this string is placed
+    #   into a class variable so that it can be overridden if
+    #   necessary.
+
+    log_format_string = '<%d>%s\000'
+
+    def log (self, message, facility=LOG_USER, priority=LOG_INFO):
+        message = self.log_format_string % (
+            self.encode_priority (facility, priority),
+            message
+            )
+        if self.unix:
+            self.socket.send (message)
+        else:
+            self.socket.sendto (message, self.address)
+
+    def encode_priority (self, facility, priority):
+        if type(facility) == type(''):
+            facility = facility_names[facility]
+        if type(priority) == type(''):
+            priority = priority_names[priority]         
+        return (facility<<3) | priority
+
+    def close (self):
+        if self.unix:
+            self.socket.close()
 
 if __name__ == '__main__':
     """
        Unit test for syslog_client.  Set up for the test by:
-	
-	* tail -f /var/log/allstuf (to see the "normal" log messages).
+    
+    * tail -f /var/log/allstuf (to see the "normal" log messages).
 
         * Running the test_logger.py script with a junk file name (which
-	  will be opened as a Unix-domain socket). "Custom" log messages
-	  will go here.
+      will be opened as a Unix-domain socket). "Custom" log messages
+      will go here.
 
-	* Run this script, passing the same junk file name.
+    * Run this script, passing the same junk file name.
 
-	* Check that the "bogus" test throws, and that none of the rest do.
+    * Check that the "bogus" test throws, and that none of the rest do.
 
-	* Check that the 'default' and 'UDP' messages show up in the tail.
+    * Check that the 'default' and 'UDP' messages show up in the tail.
 
-	* Check that the 'non-std' message shows up in the test_logger
-	  console.
+    * Check that the 'non-std' message shows up in the test_logger
+      console.
 
-	* Finally, kill off the tail and test_logger, and clean up the
-	  socket file.
+    * Finally, kill off the tail and test_logger, and clean up the
+      socket file.
     """
     import sys, traceback
 
@@ -215,14 +215,14 @@ if __name__ == '__main__':
 
     def test_client( desc, address=None ):
         try:
-	    if address:
-	        client = syslog_client( address )
-	    else:
-	        client = syslog_client()
+        if address:
+            client = syslog_client( address )
+        else:
+            client = syslog_client()
         except:
-	    print 'syslog_client() [%s] ctor threw' % desc
+        print 'syslog_client() [%s] ctor threw' % desc
             traceback.print_exc()
-	    return
+        return
 
         try:
             client.log( 'testing syslog_client() [%s]' % desc

z2.py

@@ -368,7 +368,7 @@ def server_info(old, v, offset=0):
     if v == '-': v=''
     l=string.find(v, ':')
     if l >= 0:
-	a=v[:l]
+        a=v[:l]
         v=v[l+1:]
     else:
         a=IP_ADDRESS
@@ -592,24 +592,24 @@ else:
 if HTTP_PORT:
     if type(HTTP_PORT) is type(0): HTTP_PORT=((IP_ADDRESS, HTTP_PORT),)
     for address, port in HTTP_PORT:
-	hs = zhttp_server(
-	    ip=address,
-	    port=port,
-	    resolver=rs,
-	    logger_object=lg)
-
-	# Handler for a published module. zhttp_handler takes 3 arguments:
-	# The name of the module to publish, and optionally the URI base
-	# which is basically the SCIRPT_NAME, and optionally a dictionary
-	# with CGI environment variables which override default
-	# settings. The URI base setting is useful when you want to
-	# publish more than one module with the same HTTP server. The CGI
-	# environment setting is useful when you want to proxy requests
-	# from another web server to ZServer, and would like the CGI
-	# environment to reflect the CGI environment of the other web
-	# server.    
-	zh = zhttp_handler(MODULE, '', HTTP_ENV)
-	hs.install_handler(zh)
+        hs = zhttp_server(
+            ip=address,
+            port=port,
+            resolver=rs,
+            logger_object=lg)
+
+        # Handler for a published module. zhttp_handler takes 3 arguments:
+        # The name of the module to publish, and optionally the URI base
+        # which is basically the SCIRPT_NAME, and optionally a dictionary
+        # with CGI environment variables which override default
+        # settings. The URI base setting is useful when you want to
+        # publish more than one module with the same HTTP server. The CGI
+        # environment setting is useful when you want to proxy requests
+        # from another web server to ZServer, and would like the CGI
+        # environment to reflect the CGI environment of the other web
+        # server.    
+        zh = zhttp_handler(MODULE, '', HTTP_ENV)
+        hs.install_handler(zh)
 
 
 # FTP Server
@@ -618,7 +618,7 @@ if FTP_PORT:
     for address, port in FTP_PORT:
         FTPServer(
            module=MODULE,
-	   ip=address,
+           ip=address,
            port=port,
            resolver=rs,
            logger_object=lg)
@@ -659,8 +659,8 @@ if MONITOR_PORT:
         from AccessControl.User import super
         monitor=secure_monitor_server(
             password=super._getPassword(),
-	    hostname=address,
-	    port=port)
+            hostname=address,
+            port=port)
 
 # Try to set uid to "-u" -provided uid.
 # Try to set gid to  "-u" user's primary group. 
@@ -675,7 +675,7 @@ try:
         elif type(UID) == type(1):
             uid = pwd.getpwuid(UID)[2]
             gid = pwd.getpwuid(UID)[3]
-	else:
+        else:
             raise KeyError 
         try:
             if gid is not None: