sample python3 compat

This commit is contained in:
Jean-Francois Dockes 2018-06-02 18:15:12 +02:00
parent a5a6b4112b
commit 1196f1f4f9

View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import sys import sys
import xapian import xapian
@ -80,15 +81,18 @@ def print_urlipath(xdb, doclist):
for docid in doclist: for docid in doclist:
url = get_attribute(xdb, docid, "url") url = get_attribute(xdb, docid, "url")
ipath = get_attribute(xdb, docid, "ipath") ipath = get_attribute(xdb, docid, "ipath")
print docid, url, ipath print("%s %s %s" % (docid, url, ipath))
def msg(s):
print("%s" % s, file = sys.stderr)
########## Main program ########## Main program
if len(sys.argv) < 2: if len(sys.argv) < 2:
print >> sys.stderr, "Usage: %s /path/to/db [docid [docid ...]]" % \ msg("Usage: %s /path/to/db [docid [docid ...]]" % \
sys.argv[0] sys.argv[0])
print >> sys.stderr, " will print all sets of dups if no docid is given" msg(" will print all sets of dups if no docid is given")
print >> sys.stderr, " else only the duplicates for the given docids" msg(" else only the duplicates for the given docids")
sys.exit(1) sys.exit(1)
@ -104,13 +108,13 @@ try:
alldups = find_all_dups(xdb) alldups = find_all_dups(xdb)
for dups in alldups: for dups in alldups:
print_urlipath(xdb, dups) print_urlipath(xdb, dups)
print print("")
else: else:
for docid in sys.argv[2:]: for docid in sys.argv[2:]:
dups = get_dups(xdb, docid) dups = get_dups(xdb, docid)
if dups is not None and len(dups) > 1: if dups is not None and len(dups) > 1:
print_urlipath(xdb, dups) print_urlipath(xdb, dups)
except Exception, e: except Exception as e:
print >> sys.stderr, "Xapian error: %s" % str(e) msg("Xapian error: %s" % str(e))
sys.exit(1) sys.exit(1)