- merged PLD changes

[tld-ftp-admin.git] / bin / pfa-checktree

diff --git a/bin/pfa-checktree b/bin/pfa-checktree
index b2e424a65f1275694323c2b9776bb7bcb87a9f77..6133082f7414c4c76517dbadffa8437bd44c317c 100755 (executable)
--- a/bin/pfa-checktree
+++ b/bin/pfa-checktree
@@ -1,6 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
+from __future__ import print_function
+
 import sys, os
 sys.path.insert(0, os.environ['HOME']+'/tld-ftp-admin/modules')
 import ftptree
@@ -13,8 +15,8 @@ cval=config.value
 import curses
 
 if len(sys.argv) != 3:
-    print "ERR: wrong number of arguments"
-    print "check-tree.py srctree dsttree"
+    print("ERR: wrong number of arguments")
+    print("check-tree.py srctree dsttree")
     sys.exit(1)
 
 checkdir(sys.argv[1])
@@ -22,12 +24,12 @@ checkdir(sys.argv[1])
 ftpio.connect('check-tree')
 
 if not ftpio.lock(sys.argv[1], True):
-    print "ERR: %s tree already locked" % sys.argv[1]
+    print("ERR: %s tree already locked" % sys.argv[1])
     sys.exit(1)
 
 if not ftpio.lock(sys.argv[2], True):
     ftpio.unlock(sys.argv[1])
-    print "ERR: %s tree already locked" % sys.argv[2]
+    print("ERR: %s tree already locked" % sys.argv[2])
     sys.exit(1)
 
 srctree=ftptree.FtpTree(sys.argv[1], loadall=True)
@@ -211,9 +213,9 @@ class Screen:
             else:
                 self.pkglist.bkgdset(ord(' '), self.COLOR_STANDARD)
             if i == self.pkglistselected:
-                self.pkglist.addstr(i, 2, `self.elements[i]`, curses.A_REVERSE)
+                self.pkglist.addstr(i, 2, repr(self.elements[i]), curses.A_REVERSE)
             else:
-                self.pkglist.addstr(i, 2, `self.elements[i]`, curses.A_BOLD)
+                self.pkglist.addstr(i, 2, repr(self.elements[i]), curses.A_BOLD)
             self.pkglist.bkgdset(ord(' '), self.COLOR_STANDARD)
         self.pkglist.noutrefresh(self.pkgliststartpad,0,1,0,self.pad_h,self.scr_w-1)
 
@@ -260,7 +262,7 @@ class Screen:
             self.pkgliststartpad = 0
 
     def __do_quit(self):
-        raise DoQuit
+        raise DoQuit()
 
     def __do_mark(self):
         pkg=self.elements[self.pkglistselected]
@@ -289,7 +291,7 @@ class Screen:
                     exec 'self._Screen__do_%s()' % bind[1]
 
         else:
-#            self.elements[0]=`key`
+#            self.elements[0]=repr(key)
             for bind in self.globalkeys+self.perwindowkeys[self.window-1]:
                 if bind[0].startswith('KEY_'):
                     if key == getattr(curses, bind[0]):