Changeset 706 for branches

Timestamp:

Oct 26, 2007 2:54:47 PM (12 years ago)

Author:

jpfasano

Message:

Some cleanup dealing with removal of NBuserConfig.py

Location:

branches/testScripts

Files:

• NBemail.py (modified) (5 diffs)
• NBlogMessages.py (modified) (2 diffs)
• NBprojectConfig.py (modified) (1 diff)

branches/testScripts/NBemail.py

@@ -6 +6 @@
 import smtplib
 
-import NBuserConfig
+import NBuserParameters
 import NBprojectConfig
 import NBlogMessages
@@ -27 +27 @@
   curDir = os.getcwd()
 
-  toAddrs = [unscrambleAddress(NBuserConfig.MY_EMAIL_ADDR)]
+  toAddrs = [unscrambleAddress(NBuserParameters.MY_EMAIL_ADDR)]
   if NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) \
      and \
-     NBuserConfig.SEND_MAIL_TO_PROJECT_MANAGER:
+     NBuserParameters.SEND_MAIL_TO_PROJECT_MANAGER:
     scrambledEmailAddress=NBprojectConfig.PROJECT_EMAIL_ADDRS[project]
     unscrambledEmailAddress=unscrambleAddress(scrambledEmailAddress)
@@ -94 +94 @@
 def send(toAddrs,subject,message):
 
-  sender = unscrambleAddress(NBuserConfig.SENDER_EMAIL_ADDR)  
+  sender = unscrambleAddress(NBuserParameters.SENDER_EMAIL_ADDR)  
   msgWHeader = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n"
        % (sender, ", ".join(toAddrs), subject))
@@ -100 +100 @@
 
   #store email in a file instead of sending
-  if len(NBuserConfig.EMAIL_STOREFILE) > 0 and not NBuserConfig.EMAIL_STOREFILE.isspace() :
-    NBlogMessages.writeMessage( '  store email in file '+NBuserConfig.EMAIL_STOREFILE)
-    emailfile=open(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserConfig.EMAIL_STOREFILE, 'a')
+  if len(NBuserParameters.EMAIL_STOREFILE) > 0 and not NBuserParameters.EMAIL_STOREFILE.isspace() :
+    NBlogMessages.writeMessage( '  store email in file '+NBuserParameters.EMAIL_STOREFILE)
+    emailfile=open(NBuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.EMAIL_STOREFILE, 'a')
     emailfile.write(msgWHeader)
     emailfile.write("\n============ EMAIL END ======================================\n")
@@ -109 +109 @@
 
   # Get smtp server password
-  if os.path.isfile(NBuserConfig.SMTP_PASSWORD_FILENAME) :
-    pwFilePtr = open(NBuserConfig.SMTP_PASSWORD_FILENAME,'r')
+  if os.path.isfile(NBuserParameters.SMTP_PASSWORD_FILENAME) :
+    pwFilePtr = open(NBuserParameters.SMTP_PASSWORD_FILENAME,'r')
     smtppass  = pwFilePtr.read().strip()
     #print smtppass
     pwFilePtr.close()
   else :
-    NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserConfig.SMTP_PASSWORD_FILENAME )
+    NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserParameters.SMTP_PASSWORD_FILENAME )
     sys.exit(1)
     
-  session = smtplib.SMTP(NBuserConfig.SMTP_SERVER_NAME,NBuserConfig.SMTP_SERVER_PORT)
+  session = smtplib.SMTP(NBuserParameters.SMTP_SERVER_NAME,NBuserParameters.SMTP_SERVER_PORT)
   #session.set_debuglevel(1)
-  if NBuserConfig.SMTP_SSL_SERVER==1 :
+  if NBuserParameters.SMTP_SSL_SERVER==1 :
     session.ehlo('x')
     session.starttls()
     session.ehlo('x')  
-  session.login(unscrambleAddress(NBuserConfig.SMTP_USER_NAME),smtppass)
+  session.login(unscrambleAddress(NBuserParameters.SMTP_USER_NAME),smtppass)
 
   rc = session.sendmail(sender,toAddrs,msgWHeader)

branches/testScripts/NBlogMessages.py

@@ -2 +2 @@
 
 import time
-import NBuserConfig
+import NBuserParameters
 
 #TODO: one could open the logfile once in the beginning, set it to sys.stdout, flush after each message, and close it finally
@@ -12 +12 @@
   logMsg = time.ctime(time.time())+': '
   logMsg += msg
-  if NBuserConfig.LOGPRINT :
+  if NBuserParameters.LOGPRINT :
     print logMsg
-  if len(NBuserConfig.LOGFILE) > 0 and not NBuserConfig.LOGFILE.isspace() :
-    logfile=open(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserConfig.LOGFILE, 'a')
+  if len(NBuserParameters.LOGFILE) > 0 and not NBuserParameters.LOGFILE.isspace() :
+    logfile=open(NBuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.LOGFILE, 'a')
     logfile.write(logMsg+'\n')
 #    logfile.flush()

branches/testScripts/NBprojectConfig.py

@@ -2 +2 @@
 
 import os
-import NBuserConfig
 
 #----------------------------------------------------------------------