fix examples & tests

Author: jpopelka

examples/cupstree.py

@@ -35,7 +35,7 @@ def getippqueue (dev, queue, depth):
 def getqueue (name, queue, host, depth, printers, classes):
 	indent = do_indent(depth)
 	if queue['printer-type'] & cups.CUPS_PRINTER_CLASS:
-		print "%s* Name:\t%s[@%s] (class)" % (indent, name, host)
+		print ("%s* Name:\t%s[@%s] (class)" % (indent, name, host))
 		dev = queue['device-uri']
 		if dev.startswith ('ipp:'):
 			getippqueue (dev, queue, depth)
@@ -47,11 +47,11 @@ def getqueue (name, queue, host, depth, printers, classes):
 				getqueue (member, printers[member], host,
 					  depth, printers, classes)
 	else:
-		print "%s* Name:\t%s[@%s]" % (indent, name, host)
+		print ("%s* Name:\t%s[@%s]" % (indent, name, host))
 		dev = queue['device-uri']
 		info = queue['printer-info']
-		print "%sURI:\t%s" % (indent, dev)
-		print "%sInfo:\t%s" % (indent, info)
+		print ("%sURI:\t%s" % (indent, dev))
+		print ("%sInfo:\t%s" % (indent, info))
 		if dev.startswith ('ipp:'):
 			getippqueue (dev, name, depth)
 
@@ -67,7 +67,7 @@ def gethost (host=None, depth=0):
 	printers = c.getPrinters ()
 	classes = c.getClasses ()
 	indent = do_indent(depth)
-	for name, queue in printers.iteritems ():
+	for name, queue in printers.items ():
 		getqueue (name, queue, host, depth, printers, classes)
 
 gethost()

test-enum.py

@@ -3,7 +3,7 @@
 
 def f(user_data, flags, dest):
     user_data.append (dest)
-    print flags, dest
+    print (flags, dest)
     return 1
 
 l=[]
@@ -13,6 +13,6 @@ def f(user_data, flags, dest):
     uri = i.options['printer-uri-supported']
     c, resource = cups.connectDest (i, lambda x, y, z: 1)
     name = resource.split ('/')[-1]
-    print name
+    print (name)
     n = c.getPPD(name)
     os.unlink (n)

test.py

@@ -4,31 +4,31 @@
 # Simple demonstration of cups module
 
 def callback (prompt):
-	print "Password is required for this operation"
+	print ("Password is required for this operation")
 	password = raw_input (prompt)
 	return password
 
 def test_cups_module ():
 	cups.setUser ("root")
 	cups.setPasswordCB (callback)
 	conn = cups.Connection ()
-	printers = conn.getPrinters ().keys ()
+	printers = list(conn.getPrinters ().keys ())
 
 	if 0:
-		print "Getting cupsd.conf"
+		print ("Getting cupsd.conf")
 		file ("cupsd.conf", "w")
 		conn.getFile ("/admin/conf/cupsd.conf", "cupsd.conf")
-		print "Putting cupsd.conf"
+		print ("Putting cupsd.conf")
 		conn.putFile ("/admin/conf/cupsd.conf", "cupsd.conf")
 
-	print "Getting PPD for %s" % printers[len (printers) - 1]
+	print ("Getting PPD for %s" % printers[len (printers) - 1])
 	f = conn.getPPD (printers[len (printers) - 1])
 	ppd = cups.PPD (f)
 	ppd.markDefaults ()
-	print ppd.conflicts ()
+	print (ppd.conflicts ())
 	groups = ppd.optionGroups
 	for group in groups:
 		for opt in group.options:
-			print map (lambda x: x["text"], opt.choices)
+			print (list (map (lambda x: x["text"], opt.choices)))
 
 test_cups_module ()