From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 28 Feb 2010 08:00:20 +0000 (-0000)
Subject: Remove print() usage.
X-Git-Tag: v2.2_rc64~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e2eee8ea17ab9e050d03af50e9315295ea3d8e1;p=portage.git

Remove print() usage.

svn path=/main/trunk/; revision=15494
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 39dd6eb8c..124783ca2 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -2,8 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from __future__ import print_function
-
 __all__ = [
 	"close_portdbapi_caches", "FetchlistDict", "portagetree", "portdbapi"
 ]
@@ -809,8 +807,8 @@ class portdbapi(dbapi):
 		checksums = mf.getDigests()
 		if not checksums:
 			if debug: 
-				print("[empty/missing/bad digest]: "+mypkg)
-			return None
+				writemsg("[empty/missing/bad digest]: %s\n" % (mypkg,))
+			return {}
 		filesdict={}
 		myfiles = self.getFetchMap(mypkg, useflags=useflags)
 		#XXX: maybe this should be improved: take partial downloads
@@ -1091,8 +1089,8 @@ class portdbapi(dbapi):
 			else:
 				myval = list(self._iter_match(mydep, self.cp_list(mykey)))
 		else:
-			print("ERROR: xmatch doesn't handle", level, "query!")
-			raise KeyError
+			raise AssertionError(
+				"Invalid level argument: '%s'" % level)
 
 		if self.frozen and (level not in ["match-list", "bestmatch-list"]):
 			self.xcache[level][mydep] = myval