- merged PLD changes

[tld-ftp-admin.git] / modules / baseftptree.py

diff --git a/modules/baseftptree.py b/modules/baseftptree.py
index 1f3febc0e7c7dca046362ee732fb331e1dfcbc8c..64f81a40af4220aee136e72637cde0918f82871d 100644 (file)
--- a/modules/baseftptree.py
+++ b/modules/baseftptree.py
@@ -31,12 +31,12 @@ class BasePkg:
             f.close()
 
         for entry in lines:
-            i=string.split(string.strip(entry), ':')
+            i=str.split(str.strip(entry), ':')
             if i[0] == 'info':
                 if len(i)==3:
                     self.info[i[1]]=i[2]
                 elif i[1]=='build':
-                    if not self.build.has_key(i[2]):
+                    if i[2] not in self.build:
                         self.build[i[2]]=Build()
                         self.lastbid=i[2]
                     if i[3]=='requester':
@@ -48,7 +48,7 @@ class BasePkg:
                 else:
                     self.info[i[1]]=i[2:]
             elif i[0] == 'file':
-                if not self.files.has_key(i[1]):
+                if i[1] not in self.files:
                     self.files[i[1]]=[]
                 self.files[i[1]].append(i[2])