CVS: tmda/contrib/cgi Authenticate.py,1.4,1.5 Pending.py,1.4,1.5 Session.py,1.5,1.6 View.py,1.5,1.6

[Gre7g Luterman]

Update of /cvsroot/tmda/tmda/contrib/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv16890

Modified Files:
        Authenticate.py Pending.py Session.py View.py 
Log Message:
Minor clean-ups.  Used Python's implied string functions instead of the
explicit ones.


Index: Authenticate.py
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/cgi/Authenticate.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Authenticate.py     30 Nov 2002 18:14:18 -0000      1.4
+++ Authenticate.py     6 Dec 2002 17:05:49 -0000       1.5
@@ -27,7 +27,6 @@
 import os.path
 import pwd
 import random
-import string
 
 def ComparePassword(Filename, User, Password):
   """Checks password against a given filename.
@@ -50,7 +49,7 @@
     # End of file?
     if PasswordRecord == "":
       break
-    Temp = string.split(string.strip(PasswordRecord), ":")
+    Temp = PasswordRecord.strip().split(":")
 
     # Have we found the correct user record?
     if Temp[0] == User:

Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/cgi/Pending.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Pending.py  30 Nov 2002 18:21:15 -0000      1.4
+++ Pending.py  6 Dec 2002 17:05:55 -0000       1.5
@@ -27,7 +27,6 @@
 import pwd
 import re
 import Session
-import string
 import time
 import CgiUtil
 from TMDA import Defaults

Index: Session.py
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/cgi/Session.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Session.py  30 Nov 2002 18:17:53 -0000      1.5
+++ Session.py  6 Dec 2002 17:06:14 -0000       1.6
@@ -32,11 +32,6 @@
 import CgiUtil
 import Authenticate
 
-try:
-  import paths
-except ImportError:
-  pass
-
 Rands = random.Random()
 
 # Constants
@@ -90,7 +85,7 @@
         # Is there a TMDARC variable?
         if os.environ.has_key("TMDARC"):
           # Yes, replace it
-          os.environ["TMDARC"] = string.replace(os.environ["TMDARC"], "/~/",
+          os.environ["TMDARC"] = os.environ["TMDARC"].replace("/~/",
             "/%s/" % self.Vars["User"])
         
         # Now that we know who we are, get our defaults
@@ -114,7 +109,7 @@
     # Is there a TMDARC variable?
     if os.environ.has_key("TMDARC"):
       # Yes, replace it
-      os.environ["TMDARC"] = string.replace(os.environ["TMDARC"], "/~/",
+      os.environ["TMDARC"] = os.environ["TMDARC"].replace("/~/",
         "/%s/" % Form["user"].value)
 
     # Validate the new session

Index: View.py
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/cgi/View.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- View.py     30 Nov 2002 18:21:15 -0000      1.5
+++ View.py     6 Dec 2002 17:06:24 -0000       1.6
@@ -26,7 +26,6 @@
 import os
 import pwd
 import re
-import string
 import CgiUtil
 from TMDA import Defaults
 from TMDA import Pending
@@ -156,7 +155,7 @@
     MsgHTML = """<a href="%s?cmd=view&headers=short&SID=%s"><img 
   src="display/shorthead.gif" width="100" height="65" align="right" border="0" 
   alt="Show Short Headers"></a><pre>""" % (os.environ["SCRIPT_NAME"], PVars.SID)
-    for Line in string.split(CgiUtil.Escape(MsgObj.show()), "\n"):
+    for Line in CgiUtil.Escape(MsgObj.show()).split("\n"):
       if Line == "": break
       MsgHTML += Line + "\n"
     MsgHTML += "</pre>"
@@ -188,7 +187,7 @@
       if Type == "text/plain":
         try:
           MsgHTML += "<span class=EmailText>%s</span>" % \
-            string.replace(CgiUtil.Escape(string.strip(Part.get_payload(decode=1))), 
"\n", "&nbsp;<br>")
+            CgiUtil.Escape(Part.get_payload(decode=1).strip()).replace("\n", 
+"&nbsp;<br>")
         except AttributeError:
           pass
       else:

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs