summaryrefslogtreecommitdiff
path: root/modules/cmds.py
diff options
context:
space:
mode:
Diffstat (limited to 'modules/cmds.py')
-rw-r--r--modules/cmds.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/cmds.py b/modules/cmds.py
index 80a0ecb..9fa2b19 100644
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -88,7 +88,7 @@ def load_creds():
return
else:
f=open(common.ftpadmdir+'/var/passwd', 'r')
- for line in f.xreadlines():
+ for line in f:
x=line.strip().split(':')
if len(x)>=2:
users[x[0]]=x[1]
@@ -97,7 +97,7 @@ def load_creds():
return
else:
f=open(common.ftpadmdir+'/var/cookies', 'r')
- for line in f.xreadlines():
+ for line in f:
x=line.strip().split(':')
if len(x)>=2:
users[x[0]]=x[1]
@@ -147,8 +147,7 @@ def cmd_logout(con):
def reloadftptree():
global srctree, pkglist
srctree=ftptree.FtpTree(config.value['default_to'], loadall=True)
- pkglist=srctree.keys()
- pkglist.sort()
+ pkglist=sorted(srctree.keys())
def cmd_gettree(con):
buf=''