sync with genscripts rev 343. This adds the initial py3k support and the analyse utility to gentoolkit

svn path=/trunk/gentoolkit/; revision=751

1 files changed, 8 insertions, 6 deletions

diff --git a/bin/equery b/bin/equery
index d90495b..a3bb773 100755
--- a/bin/equery
+++ b/bin/equery
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2002-2010 Gentoo Technologies, Inc.
+# Copyright 2002-2009 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 or later
 #
 # $Header$
@@ -10,6 +10,8 @@ information about packages, such as the files they own, their USE flags,
 the MD5 sum of each file owned by a given package, and many other things.
 """
 
+from __future__ import print_function
+
 import sys
 # This block ensures that ^C interrupts are handled quietly.
 try:
@@ -18,7 +20,7 @@ try:
 	def exithandler(signum,frame):
 		signal.signal(signal.SIGINT, signal.SIG_IGN)
 		signal.signal(signal.SIGTERM, signal.SIG_IGN)
-		print
+		print()
 		sys.exit(1)
 
 	signal.signal(signal.SIGINT, exithandler)
@@ -26,19 +28,19 @@ try:
 	signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 
 except KeyboardInterrupt:
-	print
+	print()
 	sys.exit(1)
 
 from gentoolkit import equery, errors
 
 try:
 	equery.main()
-except errors.GentoolkitException, err:
+except errors.GentoolkitException as err:
 	if '--debug' in sys.argv:
 		raise
 	else:
 		from gentoolkit import pprinter as pp
 		sys.stderr.write(pp.error(str(err)))
-		print
-		print "Add '--debug' to global options for traceback."
+		print()
+		print("Add '--debug' to global options for traceback.")
 		sys.exit(1)