pexpect needs explicit encoding when run under python3

[projects/pld-ftp-admin.git] / cgi-bin / index.py

diff --git a/cgi-bin/index.py b/cgi-bin/index.py
index aa0a8a335a0cb063f27ba704098b22b6fd1a426e..70845aeaceb25fcfca08d6cb0ad3b0ce2bd9e082 100755 (executable)
--- a/cgi-bin/index.py
+++ b/cgi-bin/index.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
+from __future__ import print_function
+
 # Printing errors (no SyntaxErrors though, but that's not a problem)
 import sys, os
 sys.stderr=sys.stdout
@@ -9,15 +11,15 @@ contenttypesent=False
 
 def myexceptionhandler(type, value, traceback):
     if contenttypesent:
-        print '<pre>'
+        print('<pre>')
         sys.__excepthook__(type, value, traceback)
-        print '</pre>'
+        print('</pre>')
     else:
-        print "Content-Type: text/plain\n"
+        print("Content-Type: text/plain\n")
         sys.__excepthook__(type, value, traceback)
     sys.exit(1)
 
-sys.excepthook=ziew=myexceptionhandler
+sys.excepthook=myexceptionhandler
 # End printing errors
 
 sys.path.insert(0, '../modules')
@@ -28,19 +30,10 @@ opts, cks = wwwiface.getopts()
 u=user.User(cks, opts)
 
 if u.loggedin:
-    from ftptree import FtpTree
-    import config
-    srctree=FtpTree(config.value['default_to'], loadall=True)
     wwwiface.addheader('Logged in: '+u.login)
     wwwiface.addmenu(file='loggedinmenu')
-    wwwiface.addcontent('<form action="index.py" method="post"><table border="1">')
-    wwwiface.addcontent('<tr><td>Mv</td><td>Package</td></tr>\n')
-    pkglist=srctree.keys()
-    pkglist.sort()
-    for pkg in pkglist:
-        wwwiface.addcontent('<tr><td><input type="checkbox"></td><td>'+srctree[pkg].name+'</td></tr>\n')
-    wwwiface.addcontent('<tr><td>&nbsp;</td><td><input type="submit" value="Move"></td></tr>')
-    wwwiface.addcontent('</table></form>')
+    import wwwcmds
+    wwwcmds.handlecmds(opts)
 else:
     wwwiface.addheader('Login form')
     wwwiface.addcontent(file='regform')