Update syntax of calls to print() for compatibility with Python 3.

(2to3-3.1 -f print -nw ${FILES})

svn path=/main/trunk/; revision=14290

1 files changed, 43 insertions, 43 deletions

diff --git a/bin/portageq b/bin/portageq
index 04c0ca034..0e26be01c 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -70,7 +70,7 @@ def has_version(argv):
 	Return code 0 if it's available, 1 otherwise.
 	"""
 	if (len(argv) < 2):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	if atom_validate_strict and not portage.isvalidatom(argv[1]):
 		portage.writemsg("ERROR: Invalid atom: '%s'\n" % argv[1],
@@ -92,7 +92,7 @@ def best_version(argv):
 	Returns category/package-version (without .ebuild).
 	"""
 	if (len(argv) < 2):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	if atom_validate_strict and not portage.isvalidatom(argv[1]):
 		portage.writemsg("ERROR: Invalid atom: '%s'\n" % argv[1],
@@ -100,7 +100,7 @@ def best_version(argv):
 		return 2
 	try:
 		mylist=portage.db[argv[0]]["vartree"].dbapi.match(argv[1])
-		print portage.best(mylist)
+		print(portage.best(mylist))
 	except KeyError:
 		sys.exit(1)
 best_version.uses_root = True
@@ -111,12 +111,12 @@ def mass_best_version(argv):
 	Returns category/package-version (without .ebuild).
 	"""
 	if (len(argv) < 2):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	try:
 		for pack in argv[1:]:
 			mylist=portage.db[argv[0]]["vartree"].dbapi.match(pack)
-			print pack+":"+portage.best(mylist)
+			print(pack+":"+portage.best(mylist))
 	except KeyError:
 		sys.exit(1)
 mass_best_version.uses_root = True
@@ -126,7 +126,7 @@ def metadata(argv):
 	Returns metadata values for the specified package.
 	"""
 	if (len(argv) < 4):
-		print >> sys.stderr, "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!", file=sys.stderr)
 		sys.exit(2)
 
 	root, pkgtype, pkgspec = argv[0:3]
@@ -136,7 +136,7 @@ def metadata(argv):
 		"binary":"bintree",
 		"installed":"vartree"}
 	if pkgtype not in type_map:
-		print >> sys.stderr, "Unrecognized package type: '%s'" % pkgtype
+		print("Unrecognized package type: '%s'" % pkgtype, file=sys.stderr)
 		sys.exit(1)
 	trees = portage.db
 	if os.path.realpath(root) == os.path.realpath(portage.settings["ROOT"]):
@@ -146,7 +146,7 @@ def metadata(argv):
 				pkgspec, metakeys)
 			writemsg_stdout(''.join('%s\n' % x for x in values), noiselevel=-1)
 	except KeyError:
-		print >> sys.stderr, "Package not found: '%s'" % pkgspec
+		print("Package not found: '%s'" % pkgspec, file=sys.stderr)
 		sys.exit(1)
 
 metadata.uses_root = True
@@ -158,7 +158,7 @@ def contents(argv):
 	<root>.
 	"""
 	if len(argv) != 2:
-		print "ERROR: expected 2 parameters, got %d!" % len(argv)
+		print("ERROR: expected 2 parameters, got %d!" % len(argv))
 		return 2
 
 	root, cpv = argv
@@ -350,13 +350,13 @@ def best_visible(argv):
 	Returns category/package-version (without .ebuild).
 	"""
 	if (len(argv) < 2):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	try:
 		mylist=portage.db[argv[0]]["porttree"].dbapi.match(argv[1])
 		visible=portage.best(mylist)
 		if visible:
-			print visible
+			print(visible)
 			sys.exit(0)
 		else:
 			sys.exit(1)
@@ -370,12 +370,12 @@ def mass_best_visible(argv):
 	Returns category/package-version (without .ebuild).
 	"""
 	if (len(argv) < 2):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	try:
 		for pack in argv[1:]:
 			mylist=portage.db[argv[0]]["porttree"].dbapi.match(pack)
-			print pack+":"+portage.best(mylist)
+			print(pack+":"+portage.best(mylist))
 	except KeyError:
 		sys.exit(1)
 mass_best_visible.uses_root = True
@@ -386,13 +386,13 @@ def all_best_visible(argv):
 	Returns all best_visible packages (without .ebuild).
 	"""
 	if (len(argv) < 1):
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 	
 	#print portage.db[argv[0]]["porttree"].dbapi.cp_all()
 	for pkg in portage.db[argv[0]]["porttree"].dbapi.cp_all():
 		mybest=portage.best(portage.db[argv[0]]["porttree"].dbapi.match(pkg))
 		if mybest:
-			print mybest
+			print(mybest)
 all_best_visible.uses_root = True
 
 
@@ -403,7 +403,7 @@ def match(argv):
 	be listed.
 	"""
 	if len(argv) != 2:
-		print "ERROR: expected 2 parameters, got %d!" % len(argv)
+		print("ERROR: expected 2 parameters, got %d!" % len(argv))
 		sys.exit(2)
 	root, atom = argv
 	if atom:
@@ -416,7 +416,7 @@ def match(argv):
 		results = portage.db[root]["vartree"].dbapi.cpv_all()
 		results.sort()
 	for cpv in results:
-		print cpv
+		print(cpv)
 match.uses_root = True
 
 
@@ -434,49 +434,49 @@ def gentoo_mirrors(argv):
 	"""
 	Returns the mirrors set to use in the portage configuration.
 	"""
-	print portage.settings["GENTOO_MIRRORS"]
+	print(portage.settings["GENTOO_MIRRORS"])
 
 
 def portdir(argv):
 	"""
 	Returns the PORTDIR path.
 	"""
-	print portage.settings["PORTDIR"]
+	print(portage.settings["PORTDIR"])
 
 
 def config_protect(argv):
 	"""
 	Returns the CONFIG_PROTECT paths.
 	"""
-	print portage.settings["CONFIG_PROTECT"]
+	print(portage.settings["CONFIG_PROTECT"])
 
 
 def config_protect_mask(argv):
 	"""
 	Returns the CONFIG_PROTECT_MASK paths.
 	"""
-	print portage.settings["CONFIG_PROTECT_MASK"]
+	print(portage.settings["CONFIG_PROTECT_MASK"])
 
 
 def portdir_overlay(argv):
 	"""
 	Returns the PORTDIR_OVERLAY path.
 	"""
-	print portage.settings["PORTDIR_OVERLAY"]
+	print(portage.settings["PORTDIR_OVERLAY"])
 
 
 def pkgdir(argv):
 	"""
 	Returns the PKGDIR path.
 	"""
-	print portage.settings["PKGDIR"]
+	print(portage.settings["PKGDIR"])
 
 
 def distdir(argv):
 	"""
 	Returns the DISTDIR path.
 	"""
-	print portage.settings["DISTDIR"]
+	print(portage.settings["DISTDIR"])
 
 
 def envvar(argv):
@@ -489,33 +489,33 @@ def envvar(argv):
 		argv.pop(argv.index("-v"))
 
 	if len(argv) == 0:
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 
 	for arg in argv:
 		if verbose:
-			print arg +"='"+ portage.settings[arg] +"'"
+			print(arg +"='"+ portage.settings[arg] +"'")
 		else:
-			print portage.settings[arg]
+			print(portage.settings[arg])
 
 def get_repos(argv):
 	"""<root>
 	Returns all repos with names (repo_name file) argv[0] = $ROOT
 	"""
 	if len(argv) < 1:
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
-	print " ".join(portage.db[argv[0]]["porttree"].dbapi.getRepositories())
+	print(" ".join(portage.db[argv[0]]["porttree"].dbapi.getRepositories()))
 
 def get_repo_path(argv):
 	"""<root> <repo_id>+
 	Returns the path to the repo named argv[1], argv[0] = $ROOT
 	"""
 	if len(argv) < 2:
-		print "ERROR: insufficient parameters!"
+		print("ERROR: insufficient parameters!")
 		sys.exit(2)
 	for arg in argv[1:]:
-		print portage.db[argv[0]]["porttree"].dbapi.getRepositoryPath(arg)
+		print(portage.db[argv[0]]["porttree"].dbapi.getRepositoryPath(arg))
 
 def list_preserved_libs(argv):
 	"""<root>
@@ -525,7 +525,7 @@ def list_preserved_libs(argv):
 	"""
 
 	if len(argv) != 1:
-		print "ERROR: wrong number of arguments"
+		print("ERROR: wrong number of arguments")
 		sys.exit(2)
 	mylibs = portage.db[argv[0]]["vartree"].dbapi.plib_registry.getPreservedLibs()
 	rValue = 0
@@ -546,11 +546,11 @@ list_preserved_libs.uses_root = True
 #
 
 def usage(argv):
-	print ">>> Portage information query tool"
-	print ">>> $Id$"
-	print ">>> Usage: portageq <command> [<option> ...]"
-	print ""
-	print "Available commands:"
+	print(">>> Portage information query tool")
+	print(">>> $Id$")
+	print(">>> Usage: portageq <command> [<option> ...]")
+	print("")
+	print("Available commands:")
 
 	#
 	# Show our commands -- we do this by scanning the functions in this
@@ -567,20 +567,20 @@ def usage(argv):
 
 		doc = obj.__doc__
 		if (doc == None):
-			print "   "+name
-			print "      MISSING DOCUMENTATION!"
-			print ""
+			print("   "+name)
+			print("      MISSING DOCUMENTATION!")
+			print("")
 			continue
 
 		lines = doc.split("\n")
-		print "   "+name+" "+lines[0].strip()
+		print("   "+name+" "+lines[0].strip())
 		if (len(sys.argv) > 1):
 			if ("--help" not in sys.argv):
 				lines = lines[:-1]
 			for line in lines[1:]:
-				print "      "+line.strip()
+				print("      "+line.strip())
 	if (len(sys.argv) == 1):
-		print "\nRun portageq with --help for info"
+		print("\nRun portageq with --help for info")
 
 atom_validate_strict = "EBUILD_PHASE" in os.environ