[bases-devel] SF.net SVN: bases:[29] trunk/src/bases-server

[<joe...@us...>]

Revision: 29
          http://bases.svn.sourceforge.net/bases/?rev=29&view=rev
Author:   joe_steeve
Date:     2009-02-26 08:17:06 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
cleaned up the usage of .has_key in bases-server

    * src/bases-server: changed key checking in dict from .has_key to
      'in' clause.

Modified Paths:
--------------
    trunk/src/bases-server

Modified: trunk/src/bases-server
===================================================================
--- trunk/src/bases-server	2009-02-26 08:15:56 UTC (rev 28)
+++ trunk/src/bases-server	2009-02-26 08:17:06 UTC (rev 29)
@@ -136,7 +136,7 @@
         conf['globals.local_locations']=[conf['globals.location']]
         conf['services'] = conf['services']
 
-        if conf.has_key('globals.manhole'):
+        if 'globals.manhole' in conf:
             conf['globals.manhole'] = bool(conf['globals.manhole'])
             conf['globals.manhole_ip'] = conf['globals.manhole_ip']
             conf['globals.manhole_port'] = int(conf['globals.manhole_port'])
@@ -158,20 +158,20 @@
     else:
         conf['globals.db_conn_timeout'] = 60
 
-    if conf.has_key('globals.verbosity'):
+    if 'globals.verbosity' in conf:
         conf['globals.verbosity'] = int(conf['globals.verbosity'])
     else:
         conf['globals.verbosity'] = 0
 
-    if conf.has_key('globals.log_keep_days'):
+    if 'globals.log_keep_days' in conf:
         conf['globals.log_keep_days'] = int(conf['globals.log_keep_days'])
     else:
         conf['globals.log_keep_days'] = 10
 
-    if not conf.has_key("globals.name"):
+    if "globals.name" not in conf:
         conf['globals.name'] = 'bases-server'
 
-    if not conf.has_key("globals.syslog_prefix"):
+    if "globals.syslog_prefix" not in conf:
         conf['globals.syslog_prefix'] = conf['globals.name']
         
     if len(conf['services']) == 0:
@@ -204,16 +204,16 @@
             sys.exit(1)
 
         if sd['protocol'] in strans_list:
-            if not sd.has_key('sslkey') or \
-               not sd.has_key('sslcert'):
+            if 'sslkey' not in sd or \
+               'sslcert' not in sd:
                 print "Service:%s,Protocol=%s requires sslkey and sslcert" % \
                       (sn, sd['protocol'])
                 sys.exit(1)
-            if sd.has_key('verify_peers'):
+            if 'verify_peers' in sd:
                 sd['verify_peers'] = bool(sd['verify_peers'])
             else:
                 sd['verify_peers'] = False
-            if sd['verify_peers'] is True and not sd.has_key('ca'):
+            if sd['verify_peers'] is True and 'ca' not in sd:
                 print "Service=%s,Protocol=%s requires CA to verify_peers" % \
                       (sn, sd['protocol'])
                 sys.exit(1)
@@ -302,7 +302,7 @@
         lo.bases_verbosity = conf['globals.verbosity']      
         log.startLoggingWithObserver(lo.emit, setStdout=True)
     else:
-        if conf.has_key("globals.log"):
+        if "globals.log" in conf:
             d = os.path.dirname(conf["globals.log"])
             b = os.path.basename(conf["globals.log"])
             if not os.access(d, os.W_OK):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.