", "option", False),
@@ -221,10 +222,12 @@
])
-
device_uri = mod.getDeviceUri(device_uri, printer_name,
back_end_filter=['hpaio'], filter={'scan-type': (operator.gt, 0)})
+ if not device_uri:
+ sys.exit(1)
+
for o, a in opts:
if o in ('-x', '--compression'):
a = a.strip().lower()
@@ -416,7 +419,7 @@
tlx, tly = 0, 0
page_size = size
else:
- log.error("Invalid page size. Valid page sizes are: %s" % ', '.join(PAGE_SIZES.keys()))
+ log.error("Invalid page size. Valid page sizes are: %s" % ', '.join(list(PAGE_SIZES.keys())))
log.error("Using defaults.")
elif o in ('-o', '--output', '-f', '--file'):
@@ -598,10 +601,9 @@
else: # INTERACTIVE_MODE
- import Queue
+ from base.sixext.moves import queue
from scan import sane
import scanext
- import cStringIO
try:
import subprocess
@@ -613,6 +615,8 @@
from PIL import Image
except ImportError:
log.error("%s requires the Python Imaging Library (PIL). Exiting." % __mod__)
+ if PY3: # Workaround due to incomplete Python3 support in Linux distros.
+ log.notice(log.bold("Manually install the PIL package. More information is available at http://hplipopensource.com/node/369"))
sys.exit(1)
sane.init()
@@ -631,8 +635,8 @@
try:
device = sane.openDevice(device_uri)
- except scanext.error, e:
- sane.reportError(e)
+ except scanext.error as e:
+ sane.reportError(e.args[0])
sys.exit(1)
try:
@@ -698,7 +702,7 @@
log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
log.warn("Valid resolutions are %s dpi." % ', '.join([str(x) for x in valid_res]))
res = valid_res[0]
- min_dist = sys.maxint
+ min_dist = sys.maxsize
for x in valid_res:
if abs(r-x) < min_dist:
min_dist = abs(r-x)
@@ -709,8 +713,10 @@
if scan_mode == 'color':
scan_size = scan_px * 3 # 3 bytes/px
- else:
+ elif scan_mode == 'gray':
scan_size = scan_px # 1 byte/px
+ else: # lineart
+ scan_size = scan_px // 8
if scan_size > 52428800: # 50MB
if res > 600:
@@ -733,6 +739,8 @@
contrast = int(valid_contrast[0])
elif contrast > int(valid_contrast[1]):
contrast = int(valid_contrast[1])
+
+
device.setOption('contrast', contrast)
if set_brightness:
@@ -805,8 +813,8 @@
if 'file' in dest:
log.info("Output file: %s" % output)
- update_queue = Queue.Queue()
- event_queue = Queue.Queue()
+ update_queue = queue.Queue()
+ event_queue = queue.Queue()
available_scan_mode = device.getOptionObj("mode").constraint
available_scan_mode = [x.lower() for x in available_scan_mode]
@@ -881,8 +889,8 @@
ok, expected_bytes, status = device.startScan("RGBA", update_queue, event_queue)
# Note: On some scanners (Marvell) expected_bytes will be < 0 (if lines == -1)
log.debug("expected_bytes = %d" % expected_bytes)
- except scanext.error, e:
- sane.reportError(e)
+ except scanext.error as e:
+ sane.reportError(e.args[0])
sys.exit(1)
except KeyboardInterrupt:
log.error("Aborted.")
@@ -905,7 +913,7 @@
log.debug("Expecting to read %s from scanner." % utils.format_bytes(expected_bytes))
device.waitForScanActive()
-
+
pm = tui.ProgressMeter("Reading data:")
while device.isScanActive():
@@ -925,7 +933,7 @@
log.error("Error in reading data. Status=%d bytes_read=%d." % (status, bytes_read))
sys.exit(1)
- except Queue.Empty:
+ except queue.Empty:
break
@@ -957,10 +965,10 @@
log.info("Read %s from scanner." % utils.format_bytes(bytes_read))
buffer, format, format_name, pixels_per_line, \
- lines, depth, bytes_per_line, pad_bytes, total_read = device.getScan()
+ lines, depth, bytes_per_line, pad_bytes, total_read, total_write = device.getScan()
- log.debug("PPL=%d lines=%d depth=%d BPL=%d pad=%d total=%d" %
- (pixels_per_line, lines, depth, bytes_per_line, pad_bytes, total_read))
+ log.debug("PPL=%d lines=%d depth=%d BPL=%d pad=%d total_read=%d total_write=%d" %
+ (pixels_per_line, lines, depth, bytes_per_line, pad_bytes, total_read, total_write))
#For Marvell devices, expected bytes is not same as total_read
if lines == -1 or total_read != expected_bytes:
@@ -1050,14 +1058,14 @@
try:
im.save(output)
- except IOError, e:
+ except IOError as e:
log.error("Error saving file: %s (I/O)" % e)
try:
os.remove(output)
except OSError:
pass
sys.exit(1)
- except ValueError, e:
+ except ValueError as e:
log.error("Error saving file: %s (PIL)" % e)
try:
os.remove(output)
@@ -1075,7 +1083,7 @@
output_fd, output = utils.make_temp_file(suffix='.png')
try:
im.save(output)
- except IOError, e:
+ except IOError as e:
log.error("Error saving temporary file: %s" % e)
try:
@@ -1123,8 +1131,8 @@
if dest_printer is not None:
cmd = '%s -p %s %s &' % (hp_print, dest_printer, output)
elif dest_devUri is not None:
- tmp = dest_devUri.partition(":")[2]
- dest_devUri = "hp:" + tmp
+ tmp = dest_devUri.partition(":")[2]
+ dest_devUri = "hp:" + tmp
cmd = '%s -d %s %s &' % (hp_print, dest_devUri, output)
else:
cmd = '%s %s &' % (hp_print, output)
@@ -1185,7 +1193,7 @@
std_out, std_err = sp.communicate(msg.as_string())
if std_err != '':
err = std_err
- except OSError, e:
+ except OSError as e:
err = str(e)
cleanup_spinner()
@@ -1212,6 +1220,7 @@
log.error("Editor not found.")
device.freeScan()
+ device.closeScan()
sane.deInit()
diff -Nru hplip-3.14.6/sendfax.py hplip-3.15.2/sendfax.py
--- hplip-3.14.6/sendfax.py 2014-06-03 06:33:10.000000000 +0000
+++ hplip-3.15.2/sendfax.py 2015-01-29 12:20:49.000000000 +0000
@@ -35,12 +35,13 @@
import signal
import time
import operator
+import subprocess
# Local
from base.g import *
import base.utils as utils
from base import device, tui, module
-
+from base.sixext import to_unicode, to_string_utf8
username = prop.username
faxnum_list = []
recipient_list = []
@@ -89,8 +90,11 @@
log.error("Fax is disabled (turned off during build). Exiting")
sys.exit(1)
-printer_name, device_uri = mod.getPrinterName(printer_name, device_uri,
- filter={'fax-type': (operator.gt, 0)}, back_end_filter=['hpfax'])
+sts, printer_name, device_uri = mod.getPrinterName(printer_name, device_uri,
+ filter={'fax-type': (operator.gt, 0)}, back_end_filter=['hpfax'])
+
+if not sts:
+ sys.exit(1)
if mode == GUI_MODE:
if ui_toolkit == 'qt3':
@@ -198,7 +202,6 @@
sys.exit(1)
app = QApplication(sys.argv)
-
dlg = SendFaxDialog(None, printer_name, device_uri, mod.args)
dlg.show()
@@ -217,7 +220,10 @@
sys.exit(1)
try:
- import struct, Queue
+ import struct
+ from base.sixext.moves import queue
+ from base.sixext import PY3
+ from base.sixext import to_unicode
from prnt import cups
from base import magic
@@ -285,7 +291,7 @@
aa = db.get(a)
log.info("%s (fax number: %s)" % (a, aa['fax']))
- print
+ print()
sys.exit(1)
for p in recipient_list:
@@ -295,7 +301,7 @@
log.debug("Name=%s Number=%s" % (a['name'], a['fax']))
for p in faxnum_list:
- phone_num_list.append({'fax': p, 'name': u'Unknown'})
+ phone_num_list.append({'fax': p, 'name': to_unicode('Unknown')})
log.debug("Number=%s" % p)
log.debug("Phone num list = %s" % phone_num_list)
@@ -305,6 +311,20 @@
allowable_mime_types = cups.getAllowableMIMETypes()
+ stat = ''
+ try :
+ p = subprocess.Popen('getenforce', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ stat, err = p.communicate()
+ stat = to_string_utf8(stat)
+ except OSError :
+ pass
+ except :
+ log.exception()
+ sys.exit(1)
+ if stat.strip('\n') == 'Enforcing' :
+ log.error('Unable to add file. Please disable SeLinux.\nEither disable it manually or run hp-doctor from terminal.')
+ sys.exit(0)
+
for f in mod.args:
path = os.path.realpath(f)
log.debug(path)
@@ -329,7 +349,7 @@
ppd_file = cups.getPPD(printer_name)
if ppd_file is not None and os.path.exists(ppd_file):
- if file(ppd_file, 'r').read(8192).find('HP Fax') == -1:
+ if open(ppd_file, 'rb').read(8192).find(b'HP Fax') == -1:
log.error("Fax configuration error. The CUPS fax queue for '%s' is incorrectly configured. Please make sure that the CUPS fax queue is configured with the 'HP Fax' Model/Driver." % printer_name)
sys.exit(1)
@@ -349,14 +369,14 @@
if mime_type == 'application/hplip-fax': # .g3
log.info("\nPreparing fax file %s..." % f)
- fax_file_fd = file(f, 'r')
+ fax_file_fd = open(f, 'rb')
header = fax_file_fd.read(fax.FILE_HEADER_SIZE)
fax_file_fd.close()
mg, version, pages, hort_dpi, vert_dpi, page_size, \
resolution, encoding, reserved1, reserved2 = struct.unpack(">8sBIHHBBBII", header)
- if mg != 'hplip_g3':
+ if mg != b'hplip_g3':
log.error("%s: Invalid file header. Bad magic." % f)
sys.exit(1)
@@ -393,6 +413,8 @@
if printer_state == cups.IPP_PRINTER_STATE_IDLE:
log.debug("Printer name = %s file = %s" % (printer_name, path))
+ path = to_unicode(path, 'utf-8')
+
sent_job_id = cups.printFile(printer_name, path, os.path.basename(path))
log.info("\nRendering file '%s' (job %d)..." % (path, sent_job_id))
log.debug("Job ID=%d" % sent_job_id)
@@ -426,7 +448,8 @@
if fax_file:
log.debug("Fax file=%s" % fax_file)
- title = str(result[5])
+ #title = str(result[5])
+ title = result[5]
break
time.sleep(1)
@@ -437,7 +460,7 @@
sys.exit(1)
# open the rendered file to read the file header
- f = file(fax_file, 'r')
+ f = open(fax_file, 'rb')
header = f.read(fax.FILE_HEADER_SIZE)
if len(header) != fax.FILE_HEADER_SIZE:
@@ -466,12 +489,12 @@
try:
dev.open()
- except Error, e:
+ except Error as e:
log.warn(e.msg)
try:
dev.queryDevice(quick=True)
- except Error, e:
+ except Error as e:
log.error("Query device error (%s)." % e.msg)
dev.error_state = ERROR_STATE_ERROR
@@ -490,8 +513,8 @@
service.SendEvent(device_uri, printer_name, EVENT_START_FAX_JOB, prop.username, 0, '')
- update_queue = Queue.Queue()
- event_queue = Queue.Queue()
+ update_queue = queue.Queue()
+ event_queue = queue.Queue()
log.info("\nSending fax...")
@@ -509,7 +532,7 @@
while update_queue.qsize():
try:
status, page_num, phone_num = update_queue.get(0)
- except Queue.Empty:
+ except queue.Empty:
break
if status == fax.STATUS_IDLE:
diff -Nru hplip-3.14.6/setup.py hplip-3.15.2/setup.py
--- hplip-3.14.6/setup.py 2014-06-03 06:33:10.000000000 +0000
+++ hplip-3.15.2/setup.py 2015-01-29 12:20:49.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
@@ -44,6 +44,8 @@
from base.g import *
from base import device, utils, tui, models, module, services, os_utils
from prnt import cups
+from base.sixext.moves import input
+from base.sixext import to_unicode, from_unicode_to_str
pm = None
@@ -282,8 +284,8 @@
try:
from PyQt4.QtGui import QApplication, QMessageBox
from ui4.setupdialog import SetupDialog
- except ImportError:
- log.error("Unable to load Qt4 support. Is it installed?")
+ except ImportError as e:
+ log.error("Unable to load Qt4 support. Is it installed? %s" % e)
clean_exit(1)
app = QApplication(sys.argv)
@@ -309,15 +311,15 @@
#Removing Queue
if remove:
tui.header("REMOVING PRINT/FAX QUEUE")
- remove_device = mod.getPrinterName(selected_device_name,None,['hp','hpfax'])
- selected_device_name = remove_device[0]
- log.info (log.bold("Removing '%s : %s' Queue"%(remove_device[0],remove_device[1])))
+ sts, printer_name, device_uri = mod.getPrinterName(selected_device_name,None,['hp','hpfax'])
+ selected_device_name = printer_name
+ log.info (log.bold("Removing '%s : %s' Queue"%(printer_name, device_uri)))
status, status_str = cups.cups_operation(cups.delPrinter, INTERACTIVE_MODE, '', None, selected_device_name)
if cups.IPP_OK == status:
log.info("Successfully deleted %s Print/Fax queue"%selected_device_name)
- utils.sendEvent(EVENT_CUPS_QUEUES_REMOVED,remove_device[1], remove_device[0])
+ utils.sendEvent(EVENT_CUPS_QUEUES_REMOVED,device_uri, printer_name)
clean_exit(0)
else:
log.error("Failed to delete %s Print/Fax queue. Error : %s"%(selected_device_name,status_str))
@@ -346,8 +348,10 @@
if not device_uri:
log.debug("\nDEVICE CHOOSER setup_fax=%s, setup_print=%s" % (setup_fax, setup_print))
- device_uri = mod.getDeviceUri(device_uri, selected_device_name, devices = device.probeDevices(bus))
+ device_uri = mod.getDeviceUri(devices = device.probeDevices(bus))
+ if not device_uri:
+ clean_exit(0)
# ******************************* QUERY MODEL AND COLLECT PPDS
log.info(log.bold("\nSetting up device: %s\n" % device_uri))
@@ -406,12 +410,12 @@
default_model = utils.xstrip(model.replace('series', '').replace('Series', ''), '_')
installed_print_devices = device.getSupportedCUPSDevices(['hp'])
- for d in installed_print_devices.keys():
+ for d in list(installed_print_devices.keys()):
for p in installed_print_devices[d]:
log.debug("found print queue '%s'" % p)
installed_fax_devices = device.getSupportedCUPSDevices(['hpfax'])
- for d in installed_fax_devices.keys():
+ for d in list(installed_fax_devices.keys()):
for f in installed_fax_devices[d]:
log.debug("found fax queue '%s'" % f)
@@ -448,7 +452,7 @@
if not auto:
if printer_name is None:
while True:
- printer_name = raw_input(log.bold("\nPlease enter a name for this print queue (m=use model name:'%s'*, q=quit) ?" % printer_default_model))
+ printer_name = input(log.bold("\nPlease enter a name for this print queue (m=use model name:'%s'*, q=quit) ?" % printer_default_model))
if printer_name.lower().strip() == 'q':
log.info("OK, done.")
@@ -459,14 +463,14 @@
name_ok = True
- for d in installed_print_devices.keys():
+ for d in list(installed_print_devices.keys()):
for p in installed_print_devices[d]:
if printer_name == p:
log.error("A print queue with that name already exists. Please enter a different name.")
name_ok = False
break
- for d in installed_fax_devices.keys():
+ for d in list(installed_fax_devices.keys()):
for f in installed_fax_devices[d]:
if printer_name == f:
log.error("A fax queue with that name already exists. Please enter a different name.")
@@ -519,7 +523,7 @@
ok = False
while True:
- user_input = raw_input(log.bold("\nPlease enter the full filesystem path to the PPD file to use (q=quit) :"))
+ user_input = input(log.bold("\nPlease enter the full filesystem path to the PPD file to use (q=quit) :"))
if user_input.lower().strip() == 'q':
log.info("OK, done.")
@@ -532,7 +536,7 @@
if file_path.endswith('.gz'):
nickname = gzip.GzipFile(file_path, 'r').read(4096)
else:
- nickname = file(file_path, 'r').read(4096)
+ nickname = open(file_path, 'r').read(4096)
try:
desc = nickname_pat.search(nickname).group(1)
@@ -561,7 +565,7 @@
location, info = '', '%s Device (Automatically setup by HPLIP)'%(default_model.replace('_',' '))
else:
while True:
- location = raw_input(log.bold("Enter a location description for this printer (q=quit) ?"))
+ location = input(log.bold("Enter a location description for this printer (q=quit) ?"))
if location.strip().lower() == 'q':
log.info("OK, done.")
@@ -571,7 +575,7 @@
break
while True:
- info = raw_input(log.bold("Enter additonal information or notes for this printer (q=quit) ?"))
+ info = input(log.bold("Enter additonal information or notes for this printer (q=quit) ?"))
if info.strip().lower() == 'q':
log.info("OK, done.")
@@ -593,9 +597,9 @@
time.sleep(1)
if not os.path.exists(print_ppd): # assume foomatic: or some such
- add_prnt_args = (printer_name.encode('utf8'), print_uri, location, '', print_ppd, info)
+ add_prnt_args = (printer_name, print_uri, location, '', print_ppd, info)
else:
- add_prnt_args = (printer_name.encode('utf8'), print_uri, location, print_ppd, '', info)
+ add_prnt_args = (printer_name, print_uri, location, print_ppd, '', info)
status, status_str = cups.cups_operation(cups.addPrinter, INTERACTIVE_MODE, '', None, *add_prnt_args)
@@ -668,7 +672,7 @@
if not auto:
if fax_name is None:
while True:
- fax_name = raw_input(log.bold("\nPlease enter a name for this fax queue (m=use model name:'%s'*, q=quit) ?" % fax_default_model))
+ fax_name = input(log.bold("\nPlease enter a name for this fax queue (m=use model name:'%s'*, q=quit) ?" % fax_default_model))
if fax_name.lower().strip() == 'q':
log.info("OK, done.")
@@ -679,14 +683,14 @@
name_ok = True
- for d in installed_print_devices.keys():
+ for d in list(installed_print_devices.keys()):
for p in installed_print_devices[d]:
if fax_name == p:
log.error("A print queue with that name already exists. Please enter a different name.")
name_ok = False
break
- for d in installed_fax_devices.keys():
+ for d in list(installed_fax_devices.keys()):
for f in installed_fax_devices[d]:
if fax_name == f:
log.error("A fax queue with that name already exists. Please enter a different name.")
@@ -715,7 +719,7 @@
location, info = '', '%s Fax Device (Automatically setup by HPLIP)'%(default_model.replace('_',' '))
else:
while True:
- location = raw_input(log.bold("Enter a location description for this printer (q=quit) ?"))
+ location = input(log.bold("Enter a location description for this printer (q=quit) ?"))
if location.strip().lower() == 'q':
log.info("OK, done.")
@@ -725,7 +729,7 @@
break
while True:
- info = raw_input(log.bold("Enter additonal information or notes for this printer (q=quit) ?"))
+ info = input(log.bold("Enter additonal information or notes for this printer (q=quit) ?"))
if info.strip().lower() == 'q':
log.info("OK, done.")
@@ -743,10 +747,10 @@
cups.setPasswordPrompt("You do not have permission to add a fax device.")
if not os.path.exists(fax_ppd): # assume foomatic: or some such
- status, status_str = cups.addPrinter(fax_name.encode('utf8'), fax_uri,
+ status, status_str = cups.addPrinter(fax_name, fax_uri,
location, '', fax_ppd, info)
else:
- status, status_str = cups.addPrinter(fax_name.encode('utf8'), fax_uri,
+ status, status_str = cups.addPrinter(fax_name, fax_uri,
location, fax_ppd, '', info)
log.debug("addPrinter() returned (%d, %s)" % (status, status_str))
@@ -768,7 +772,7 @@
setup_fax = False
else:
while True:
- user_input = raw_input(log.bold("\nWould you like to perform fax header setup (y=yes*, n=no, q=quit) ?")).strip().lower()
+ user_input = input(log.bold("\nWould you like to perform fax header setup (y=yes*, n=no, q=quit) ?")).strip().lower()
if user_input == 'q':
log.info("OK, done.")
@@ -801,7 +805,7 @@
try:
current_phone_num = str(d.getPhoneNum())
- current_station_name = d.getStationName()
+ current_station_name = to_unicode(d.getStationName())
except Error:
log.error("Could not communicate with device. Device may be busy. Please wait for retry...")
time.sleep(5)
@@ -817,9 +821,9 @@
if ok:
while True:
if current_phone_num:
- phone_num = raw_input(log.bold("\nEnter the fax phone number for this device (c=use current:'%s'*, q=quit) ?" % current_phone_num))
+ phone_num = input(log.bold("\nEnter the fax phone number for this device (c=use current:'%s'*, q=quit) ?" % current_phone_num))
else:
- phone_num = raw_input(log.bold("\nEnter the fax phone number for this device (q=quit) ?"))
+ phone_num = input(log.bold("\nEnter the fax phone number for this device (q=quit) ?"))
if phone_num.strip().lower() == 'q':
log.info("OK, done.")
clean_exit(0)
@@ -845,20 +849,22 @@
while True:
if current_station_name:
- station_name = raw_input(log.bold("\nEnter the name and/or company for this device (c=use current:'%s'*, q=quit) ?" % current_station_name.encode('utf-8')))
+ station_name = input(log.bold("\nEnter the name and/or company for this device (c=use current:'%s'*, q=quit) ?"%from_unicode_to_str(current_station_name)))
else:
- station_name = raw_input(log.bold("\nEnter the name and/or company for this device (q=quit) ?"))
-
+ station_name = input(log.bold("\nEnter the name and/or company for this device (q=quit) ?"))
if station_name.strip().lower() == 'q':
log.info("OK, done.")
clean_exit(0)
if current_station_name and (not station_name or station_name.strip().lower() == 'c'):
station_name = current_station_name
-
- if isinstance(station_name, str):
- station_name = station_name.decode('utf-8')
+ ### Here station_name can be unicode or utf-8 sequence.
+ ### making sure to convert data to unicode for all the cases.
+ try:
+ station_name.encode('utf-8')
+ except (UnicodeEncodeError,UnicodeDecodeError):
+ station_name = station_name.decode('utf-8')
if len(station_name) > 50:
log.error("Name/company length is too long (>50 characters). Please enter a shorter name/company.")
diff -Nru hplip-3.14.6/testpage.py hplip-3.15.2/testpage.py
--- hplip-3.14.6/testpage.py 2014-06-03 06:33:10.000000000 +0000
+++ hplip-3.15.2/testpage.py 2015-01-29 12:20:49.000000000 +0000
@@ -49,8 +49,12 @@
opts, device_uri, printer_name, mode, ui_toolkit, loc = \
mod.parseStdOpts()
- printer_name, device_uri = mod.getPrinterName(printer_name, device_uri)
wait_for_printout = False
+ sts, printer_name, device_uri = mod.getPrinterName(printer_name, device_uri)
+
+ if not sts:
+ log.error("No installed printers found (or) Invalid printer device selected")
+ sys.exit(1)
if mode == GUI_MODE:
if not utils.canEnterGUIMode4():
@@ -69,7 +73,6 @@
if 1:
app = QApplication(sys.argv)
-
dialog = PrintTestPageDialog(None, printer_name)
dialog.show()
try:
@@ -84,7 +87,7 @@
#else: # INTERACTIVE_MODE
try:
d = device.Device(device_uri, printer_name)
- except Error, e:
+ except Error as e:
log.error("Device error (%s)." % e.msg)
sys.exit(1)
@@ -104,7 +107,7 @@
log.info( "Printing test page to printer %s..." % printer_name)
try:
d.printTestPage(printer_name)
- except Error, e:
+ except Error as e:
if e.opt == ERROR_NO_CUPS_QUEUE_FOUND_FOR_DEVICE:
log.error("No CUPS queue found for device. Please install the printer in CUPS and try again.")
else:
@@ -121,7 +124,7 @@
try:
d.queryDevice(quick=True)
- except Error, e:
+ except Error as e:
log.error("An error has occured.")
if d.error_state == ERROR_STATE_CLEAR:
diff -Nru hplip-3.14.6/timedate.py hplip-3.15.2/timedate.py
--- hplip-3.14.6/timedate.py 2014-06-03 06:33:10.000000000 +0000
+++ hplip-3.15.2/timedate.py 2015-01-29 12:20:49.000000000 +0000
@@ -73,9 +73,12 @@
filter={'fax-type': (operator.gt, 0)},
back_end_filter=['hpfax'])
+ if not device_uri:
+ sys.exit(1)
+
try:
d = faxdevice.FaxDevice(device_uri, printer_name, disable_dbus=True)
- except Error, e:
+ except Error as e:
if e.opt == ERROR_DEVICE_DOES_NOT_SUPPORT_OPERATION:
log.error("Device does not support setting time/date.")
sys.exit(1)
diff -Nru hplip-3.14.6/toolbox.py hplip-3.15.2/toolbox.py
--- hplip-3.14.6/toolbox.py 2014-06-03 06:33:10.000000000 +0000
+++ hplip-3.15.2/toolbox.py 2015-01-29 12:20:49.000000000 +0000
@@ -35,6 +35,7 @@
# Local
from base.g import *
+#from . import base.utils as utils
import base.utils as utils
from base import status, tui, module
@@ -187,7 +188,7 @@
log.debug("Killing child toolbox process (pid=%d)..." % child_pid)
try:
os.kill(child_pid, signal.SIGKILL)
- except OSError, e:
+ except OSError as e:
log.debug("Failed: %s" % e.message)
mod.unlockInstance()
@@ -206,7 +207,7 @@
try:
session_bus = dbus.SessionBus()
- except dbus.exceptions.DBusException, e:
+ except dbus.exceptions.DBusException as e:
if os.getuid() != 0:
log.error("Unable to connect to dbus session bus. Exiting.")
sys.exit(1)
@@ -231,7 +232,7 @@
log.debug("Killing parent toolbox process (pid=%d)..." % parent_pid)
try:
os.kill(parent_pid, signal.SIGKILL)
- except OSError, e:
+ except OSError as e:
log.debug("Failed: %s" % e.message)
mod.unlockInstance()
diff -Nru hplip-3.14.6/ui/aboutdlg.py hplip-3.15.2/ui/aboutdlg.py
--- hplip-3.14.6/ui/aboutdlg.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/aboutdlg.py 2015-01-29 12:20:22.000000000 +0000
@@ -28,8 +28,8 @@
# Local
from base.g import *
-from aboutdlg_base import AboutDlg_base
-from ui_utils import load_pixmap
+from .aboutdlg_base import AboutDlg_base
+from .ui_utils import load_pixmap
class AboutDlg(AboutDlg_base):
diff -Nru hplip-3.14.6/ui/align10form.py hplip-3.15.2/ui/align10form.py
--- hplip-3.14.6/ui/align10form.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/align10form.py 2015-01-29 12:20:22.000000000 +0000
@@ -24,11 +24,11 @@
# Local
from base.g import *
from base import maint
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from align10form_base import Align10Form_Base
+from .align10form_base import Align10Form_Base
# Also supports align-type==11
class Align10Form(Align10Form_Base):
@@ -47,7 +47,7 @@
def getValues(self):
ret = []
- controls = self.controls.keys()
+ controls = list(self.controls.keys())
controls.sort()
for line in controls:
diff -Nru hplip-3.14.6/ui/align13form.py hplip-3.15.2/ui/align13form.py
--- hplip-3.14.6/ui/align13form.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/align13form.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,7 +26,7 @@
# Qt
from qt import *
-from align13form_base import Align13Form_Base
+from .align13form_base import Align13Form_Base
class Align13Form(Align13Form_Base):
diff -Nru hplip-3.14.6/ui/alignform.py hplip-3.15.2/ui/alignform.py
--- hplip-3.14.6/ui/alignform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/alignform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,7 +23,7 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
@@ -71,11 +71,11 @@
ChoiceLayout = QHBoxLayout(None,0,6,"ChoiceLayout")
for x in range(1, choice_count+1):
- exec 'self.radioButton%d = QRadioButton( self.buttonGroup, "radioButton%d" )' % (x, x)
- exec 'self.radioButton%d.setText( "%s%d" )' % (x, line_id, x)
+ exec('self.radioButton%d = QRadioButton( self.buttonGroup, "radioButton%d" )' % (x, x))
+ exec('self.radioButton%d.setText( "%s%d" )' % (x, line_id, x))
if x == mid_point:
- exec 'self.radioButton%d.setChecked( 1 )' % x
- exec 'ChoiceLayout.addWidget( self.radioButton%d )' % x
+ exec('self.radioButton%d.setChecked( 1 )' % x)
+ exec('ChoiceLayout.addWidget( self.radioButton%d )' % x)
buttonGroupLayout.addMultiCellLayout(ChoiceLayout, 1, 1, 0, 1)
diff -Nru hplip-3.14.6/ui/aligntype6form1.py hplip-3.15.2/ui/aligntype6form1.py
--- hplip-3.14.6/ui/aligntype6form1.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/aligntype6form1.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,7 +20,7 @@
#
from qt import *
-from aligntype6form1_base import AlignType6Form1_base
+from .aligntype6form1_base import AlignType6Form1_base
class AlignType6Form1(AlignType6Form1_base):
diff -Nru hplip-3.14.6/ui/aligntype6form2.py hplip-3.15.2/ui/aligntype6form2.py
--- hplip-3.14.6/ui/aligntype6form2.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/aligntype6form2.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,7 +20,7 @@
#
from qt import *
-from aligntype6form2_base import AlignType6Form2_base
+from .aligntype6form2_base import AlignType6Form2_base
class AlignType6Form2(AlignType6Form2_base):
def __init__(self,parent = None,name = None,modal = 0,fl = 0):
diff -Nru hplip-3.14.6/ui/allowabletypesdlg.py hplip-3.15.2/ui/allowabletypesdlg.py
--- hplip-3.14.6/ui/allowabletypesdlg.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/allowabletypesdlg.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,7 +20,7 @@
#
from qt import *
-from allowabletypesdlg_base import AllowableTypesDlg_base
+from .allowabletypesdlg_base import AllowableTypesDlg_base
class AllowableTypesDlg(AllowableTypesDlg_base):
def __init__(self, allowables, parent=None, name=None, modal=0, fl=0):
diff -Nru hplip-3.14.6/ui/choosedevicedlg.py hplip-3.15.2/ui/choosedevicedlg.py
--- hplip-3.14.6/ui/choosedevicedlg.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/choosedevicedlg.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,6 +20,7 @@
#
from base.g import *
+from base.sixext import to_unicode
import sys
from qt import *
@@ -96,7 +97,7 @@
return qApp.translate("ChooseDeviceDlg",s,c)
def DevicesButtonGroup_clicked(self,a0):
- self.device_uri = unicode(self.radio_buttons[a0].text())
+ self.device_uri = to_unicode(self.radio_buttons[a0].text())
if __name__ == "__main__":
a = QApplication(sys.argv)
diff -Nru hplip-3.14.6/ui/chooseprinterdlg.py hplip-3.15.2/ui/chooseprinterdlg.py
--- hplip-3.14.6/ui/chooseprinterdlg.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/chooseprinterdlg.py 2015-01-29 12:20:22.000000000 +0000
@@ -21,6 +21,7 @@
from base.g import *
from base import device
+from base.sixext import to_unicode
import sys
from qt import *
@@ -119,7 +120,7 @@
def DevicesButtonGroup_clicked(self,a0):
for p in self.printer_index:
pp = self.printer_index[p]
- if unicode(self.radio_buttons[a0].text()).startswith(pp[0]):
+ if to_unicode(self.radio_buttons[a0].text()).startswith(pp[0]):
self.device_uri = pp[1]
self.printer_name = pp[0]
break
diff -Nru hplip-3.14.6/ui/cleaningform2.py hplip-3.15.2/ui/cleaningform2.py
--- hplip-3.14.6/ui/cleaningform2.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/cleaningform2.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from cleaningform2_base import CleaningForm2_base
+from .cleaningform2_base import CleaningForm2_base
class CleaningForm2(CleaningForm2_base):
diff -Nru hplip-3.14.6/ui/cleaningform.py hplip-3.15.2/ui/cleaningform.py
--- hplip-3.14.6/ui/cleaningform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/cleaningform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,12 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from base.sixext import to_unicode
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from cleaningform_base import CleaningForm_base
+from .cleaningform_base import CleaningForm_base
class CleaningForm(CleaningForm_base):
@@ -35,13 +36,13 @@
CleaningForm_base.__init__(self, parent, name, modal, fl)
self.dev = dev
- text = unicode(self.CleaningText.text())
+ text = to_unicode(self.CleaningText.text())
self.CleaningText.setText(text % str(cleaning_level + 1))
- text = unicode(self.Continue.text())
+ text = to_unicode(self.Continue.text())
self.Continue.setText(text % str(cleaning_level + 1))
- text = unicode(self.CleaningTitle.text())
+ text = to_unicode(self.CleaningTitle.text())
self.CleaningTitle.setText(text % str(cleaning_level))
self.Icon.setPixmap(load_pixmap('clean.png', 'other'))
diff -Nru hplip-3.14.6/ui/coloradjform_base.py hplip-3.15.2/ui/coloradjform_base.py
--- hplip-3.14.6/ui/coloradjform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/coloradjform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -243,7 +243,7 @@
def buttonGroup_clicked(self,a0):
- print "ColorAdjForm_base.buttonGroup_clicked(int): Not implemented yet"
+ print("ColorAdjForm_base.buttonGroup_clicked(int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("ColorAdjForm_base",s,c)
diff -Nru hplip-3.14.6/ui/coloradjform.py hplip-3.15.2/ui/coloradjform.py
--- hplip-3.14.6/ui/coloradjform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/coloradjform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from coloradjform_base import ColorAdjForm_base
+from .coloradjform_base import ColorAdjForm_base
class ColorAdjForm(ColorAdjForm_base):
def __init__(self, parent, line, name = None, modal = 0, fl = 0):
diff -Nru hplip-3.14.6/ui/colorcal4form_base.py hplip-3.15.2/ui/colorcal4form_base.py
--- hplip-3.14.6/ui/colorcal4form_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcal4form_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -211,19 +211,19 @@
def ColorNumberComboBox_highlighted(self,a0):
- print "ColorCal4Form_base.ColorNumberComboBox_highlighted(const QString&): Not implemented yet"
+ print("ColorCal4Form_base.ColorNumberComboBox_highlighted(const QString&): Not implemented yet")
def ColorLetterComboBox_highlighted(self,a0):
- print "ColorCal4Form_base.ColorLetterComboBox_highlighted(const QString&): Not implemented yet"
+ print("ColorCal4Form_base.ColorLetterComboBox_highlighted(const QString&): Not implemented yet")
def GrayLetterComboBox_highlighted(self,a0):
- print "ColorCal4Form_base.GrayLetterComboBox_highlighted(const QString&): Not implemented yet"
+ print("ColorCal4Form_base.GrayLetterComboBox_highlighted(const QString&): Not implemented yet")
def GrayNumberComboBox_highlighted(self,a0):
- print "ColorCal4Form_base.GrayNumberComboBox_highlighted(const QString&): Not implemented yet"
+ print("ColorCal4Form_base.GrayNumberComboBox_highlighted(const QString&): Not implemented yet")
def UseDefaultsButton_clicked(self):
- print "ColorCal4Form_base.UseDefaultsButton_clicked(): Not implemented yet"
+ print("ColorCal4Form_base.UseDefaultsButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("ColorCal4Form_base",s,c)
diff -Nru hplip-3.14.6/ui/colorcal4form.py hplip-3.15.2/ui/colorcal4form.py
--- hplip-3.14.6/ui/colorcal4form.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcal4form.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from colorcal4form_base import ColorCal4Form_base
+from .colorcal4form_base import ColorCal4Form_base
class ColorCal4Form(ColorCal4Form_base):
diff -Nru hplip-3.14.6/ui/colorcalform2_base.py hplip-3.15.2/ui/colorcalform2_base.py
--- hplip-3.14.6/ui/colorcalform2_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcalform2_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -95,10 +95,10 @@
def buttonGroup_clicked(self,a0):
- print "ColorCalForm2_base.buttonGroup_clicked(int): Not implemented yet"
+ print("ColorCalForm2_base.buttonGroup_clicked(int): Not implemented yet")
def SpinBox_valueChanged(self,a0):
- print "ColorCalForm2_base.SpinBox_valueChanged(int): Not implemented yet"
+ print("ColorCalForm2_base.SpinBox_valueChanged(int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("ColorCalForm2_base",s,c)
diff -Nru hplip-3.14.6/ui/colorcalform2.py hplip-3.15.2/ui/colorcalform2.py
--- hplip-3.14.6/ui/colorcalform2.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcalform2.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from colorcalform2_base import ColorCalForm2_base
+from .colorcalform2_base import ColorCalForm2_base
class ColorCalForm2(ColorCalForm2_base):
def __init__(self,parent = None,name = None,modal = 0,fl = 0):
diff -Nru hplip-3.14.6/ui/colorcalform_base.py hplip-3.15.2/ui/colorcalform_base.py
--- hplip-3.14.6/ui/colorcalform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcalform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -98,13 +98,13 @@
def buttonGroup2_clicked(self,a0):
- print "ColorCalForm_base.buttonGroup2_clicked(int): Not implemented yet"
+ print("ColorCalForm_base.buttonGroup2_clicked(int): Not implemented yet")
def ColorCalGroup_released(self,a0):
- print "ColorCalForm_base.ColorCalGroup_released(int): Not implemented yet"
+ print("ColorCalForm_base.ColorCalGroup_released(int): Not implemented yet")
def ColorCalGroup_clicked(self,a0):
- print "ColorCalForm_base.ColorCalGroup_clicked(int): Not implemented yet"
+ print("ColorCalForm_base.ColorCalGroup_clicked(int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("ColorCalForm_base",s,c)
diff -Nru hplip-3.14.6/ui/colorcalform.py hplip-3.15.2/ui/colorcalform.py
--- hplip-3.14.6/ui/colorcalform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/colorcalform.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,7 +20,7 @@
#
from qt import *
-from colorcalform_base import ColorCalForm_base
+from .colorcalform_base import ColorCalForm_base
class ColorCalForm(ColorCalForm_base):
def __init__(self,parent = None,name = None,modal = 0,fl = 0):
diff -Nru hplip-3.14.6/ui/coverpageform_base.py hplip-3.15.2/ui/coverpageform_base.py
--- hplip-3.14.6/ui/coverpageform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/coverpageform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -134,16 +134,16 @@
def coverpageListBox_currentChanged(self,a0):
- print "CoverpageForm_base.coverpageListBox_currentChanged(QListBoxItem*): Not implemented yet"
+ print("CoverpageForm_base.coverpageListBox_currentChanged(QListBoxItem*): Not implemented yet")
def prevCoverpageButton_clicked(self):
- print "CoverpageForm_base.prevCoverpageButton_clicked(): Not implemented yet"
+ print("CoverpageForm_base.prevCoverpageButton_clicked(): Not implemented yet")
def nextCoverpageButton_clicked(self):
- print "CoverpageForm_base.nextCoverpageButton_clicked(): Not implemented yet"
+ print("CoverpageForm_base.nextCoverpageButton_clicked(): Not implemented yet")
def preserveFormattingCheckBox_toggled(self,a0):
- print "CoverpageForm_base.preserveFormattingCheckBox_toggled(bool): Not implemented yet"
+ print("CoverpageForm_base.preserveFormattingCheckBox_toggled(bool): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("CoverpageForm_base",s,c)
diff -Nru hplip-3.14.6/ui/coverpageform.py hplip-3.15.2/ui/coverpageform.py
--- hplip-3.14.6/ui/coverpageform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/coverpageform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,13 +23,13 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
from fax import coverpages
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from coverpageform_base import CoverpageForm_base
+from .coverpageform_base import CoverpageForm_base
@@ -41,7 +41,7 @@
self.preserveFormattingCheckBox.setChecked(preserve_formatting)
self.prevCoverpageButton.setPixmap(load_pixmap('prev', '16x16'))
self.nextCoverpageButton.setPixmap(load_pixmap('next', '16x16'))
- self.coverpage_list = coverpages.COVERPAGES.keys()
+ self.coverpage_list = list(coverpages.COVERPAGES.keys())
if cover_page_name:
self.coverpage_index = self.coverpage_list.index(cover_page_name)
diff -Nru hplip-3.14.6/ui/deviceuricombobox.py hplip-3.15.2/ui/deviceuricombobox.py
--- hplip-3.14.6/ui/deviceuricombobox.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/deviceuricombobox.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,8 +23,9 @@
# Local
from base.g import *
-from ui_utils import *
+from .ui_utils import *
from base import device, utils
+from base.sixext import to_unicode
# Qt3
from qt import *
@@ -124,8 +125,8 @@
self.updating = True
try:
k = 0
- str_devices = self.devices.keys()
- d = str(str_devices[0])
+ str_devices = list(self.devices.keys())
+ d = to_unicode(str_devices[0])
for i in range(0, num_devices):
self.ComboBox.insertItem(str_devices[i], i)
if self.initial_device is not None and d == self.initial_device:
@@ -146,7 +147,7 @@
if self.updating:
return
- self.device_uri = unicode(t)
+ self.device_uri = str(t)
if self.device_uri:
#user_conf.set('last_used', 'device_uri', self.device_uri)
self.user_settings.last_used_device_uri = self.device_uri
diff -Nru hplip-3.14.6/ui/devmgr4_base.py hplip-3.15.2/ui/devmgr4_base.py
--- hplip-3.14.6/ui/devmgr4_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/devmgr4_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -378,199 +378,199 @@
def fileNew(self):
- print "DevMgr4_base.fileNew(): Not implemented yet"
+ print("DevMgr4_base.fileNew(): Not implemented yet")
def fileOpen(self):
- print "DevMgr4_base.fileOpen(): Not implemented yet"
+ print("DevMgr4_base.fileOpen(): Not implemented yet")
def fileSave(self):
- print "DevMgr4_base.fileSave(): Not implemented yet"
+ print("DevMgr4_base.fileSave(): Not implemented yet")
def fileSaveAs(self):
- print "DevMgr4_base.fileSaveAs(): Not implemented yet"
+ print("DevMgr4_base.fileSaveAs(): Not implemented yet")
def filePrint(self):
- print "DevMgr4_base.filePrint(): Not implemented yet"
+ print("DevMgr4_base.filePrint(): Not implemented yet")
def fileExit(self):
- print "DevMgr4_base.fileExit(): Not implemented yet"
+ print("DevMgr4_base.fileExit(): Not implemented yet")
def editUndo(self):
- print "DevMgr4_base.editUndo(): Not implemented yet"
+ print("DevMgr4_base.editUndo(): Not implemented yet")
def editRedo(self):
- print "DevMgr4_base.editRedo(): Not implemented yet"
+ print("DevMgr4_base.editRedo(): Not implemented yet")
def editCut(self):
- print "DevMgr4_base.editCut(): Not implemented yet"
+ print("DevMgr4_base.editCut(): Not implemented yet")
def editCopy(self):
- print "DevMgr4_base.editCopy(): Not implemented yet"
+ print("DevMgr4_base.editCopy(): Not implemented yet")
def editPaste(self):
- print "DevMgr4_base.editPaste(): Not implemented yet"
+ print("DevMgr4_base.editPaste(): Not implemented yet")
def editFind(self):
- print "DevMgr4_base.editFind(): Not implemented yet"
+ print("DevMgr4_base.editFind(): Not implemented yet")
def helpIndex(self):
- print "DevMgr4_base.helpIndex(): Not implemented yet"
+ print("DevMgr4_base.helpIndex(): Not implemented yet")
def helpContents(self):
- print "DevMgr4_base.helpContents(): Not implemented yet"
+ print("DevMgr4_base.helpContents(): Not implemented yet")
def helpAbout(self):
- print "DevMgr4_base.helpAbout(): Not implemented yet"
+ print("DevMgr4_base.helpAbout(): Not implemented yet")
def deviceRescanAction_activated(self):
- print "DevMgr4_base.deviceRescanAction_activated(): Not implemented yet"
+ print("DevMgr4_base.deviceRescanAction_activated(): Not implemented yet")
def settingsEmailAlertsAction_activated(self):
- print "DevMgr4_base.settingsEmailAlertsAction_activated(): Not implemented yet"
+ print("DevMgr4_base.settingsEmailAlertsAction_activated(): Not implemented yet")
def DeviceList_currentChanged(self,a0):
- print "DevMgr4_base.DeviceList_currentChanged(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.DeviceList_currentChanged(QIconViewItem*): Not implemented yet")
def CleanPensButton_clicked(self):
- print "DevMgr4_base.CleanPensButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.CleanPensButton_clicked(): Not implemented yet")
def AlignPensButton_clicked(self):
- print "DevMgr4_base.AlignPensButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.AlignPensButton_clicked(): Not implemented yet")
def PrintTestPageButton_clicked(self):
- print "DevMgr4_base.PrintTestPageButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.PrintTestPageButton_clicked(): Not implemented yet")
def AdvancedInfoButton_clicked(self):
- print "DevMgr4_base.AdvancedInfoButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.AdvancedInfoButton_clicked(): Not implemented yet")
def ColorCalibrationButton_clicked(self):
- print "DevMgr4_base.ColorCalibrationButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.ColorCalibrationButton_clicked(): Not implemented yet")
def settingsConfigure_activated(self):
- print "DevMgr4_base.settingsConfigure_activated(): Not implemented yet"
+ print("DevMgr4_base.settingsConfigure_activated(): Not implemented yet")
def PrintButton_clicked(self):
- print "DevMgr4_base.PrintButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.PrintButton_clicked(): Not implemented yet")
def ScanButton_clicked(self):
- print "DevMgr4_base.ScanButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.ScanButton_clicked(): Not implemented yet")
def PCardButton_clicked(self):
- print "DevMgr4_base.PCardButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.PCardButton_clicked(): Not implemented yet")
def SendFaxButton_clicked(self):
- print "DevMgr4_base.SendFaxButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.SendFaxButton_clicked(): Not implemented yet")
def MakeCopiesButton_clicked(self):
- print "DevMgr4_base.MakeCopiesButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.MakeCopiesButton_clicked(): Not implemented yet")
def ConfigureFeaturesButton_clicked(self):
- print "DevMgr4_base.ConfigureFeaturesButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.ConfigureFeaturesButton_clicked(): Not implemented yet")
def CancelJobButton_clicked(self):
- print "DevMgr4_base.CancelJobButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.CancelJobButton_clicked(): Not implemented yet")
def deviceRefreshAll_activated(self):
- print "DevMgr4_base.deviceRefreshAll_activated(): Not implemented yet"
+ print("DevMgr4_base.deviceRefreshAll_activated(): Not implemented yet")
def DeviceList_clicked(self,a0):
- print "DevMgr4_base.DeviceList_clicked(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.DeviceList_clicked(QIconViewItem*): Not implemented yet")
def autoRefresh_toggled(self,a0):
- print "DevMgr4_base.autoRefresh_toggled(bool): Not implemented yet"
+ print("DevMgr4_base.autoRefresh_toggled(bool): Not implemented yet")
def PrintJobList_currentChanged(self,a0):
- print "DevMgr4_base.PrintJobList_currentChanged(QListViewItem*): Not implemented yet"
+ print("DevMgr4_base.PrintJobList_currentChanged(QListViewItem*): Not implemented yet")
def CancelPrintJobButton_clicked(self):
- print "DevMgr4_base.CancelPrintJobButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.CancelPrintJobButton_clicked(): Not implemented yet")
def PrintJobList_selectionChanged(self,a0):
- print "DevMgr4_base.PrintJobList_selectionChanged(QListViewItem*): Not implemented yet"
+ print("DevMgr4_base.PrintJobList_selectionChanged(QListViewItem*): Not implemented yet")
def DeviceList_rightButtonClicked(self,a0,a1):
- print "DevMgr4_base.DeviceList_rightButtonClicked(QIconViewItem*,const QPoint&): Not implemented yet"
+ print("DevMgr4_base.DeviceList_rightButtonClicked(QIconViewItem*,const QPoint&): Not implemented yet")
def OpenEmbeddedBrowserButton_clicked(self):
- print "DevMgr4_base.OpenEmbeddedBrowserButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.OpenEmbeddedBrowserButton_clicked(): Not implemented yet")
def deviceSettingsButton_clicked(self):
- print "DevMgr4_base.deviceSettingsButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.deviceSettingsButton_clicked(): Not implemented yet")
def faxSetupWizardButton_clicked(self):
- print "DevMgr4_base.faxSetupWizardButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.faxSetupWizardButton_clicked(): Not implemented yet")
def faxSettingsButton_clicked(self):
- print "DevMgr4_base.faxSettingsButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.faxSettingsButton_clicked(): Not implemented yet")
def setupDevice_activated(self):
- print "DevMgr4_base.setupDevice_activated(): Not implemented yet"
+ print("DevMgr4_base.setupDevice_activated(): Not implemented yet")
def viewSupportAction_activated(self):
- print "DevMgr4_base.viewSupportAction_activated(): Not implemented yet"
+ print("DevMgr4_base.viewSupportAction_activated(): Not implemented yet")
def installDevice_activated(self):
- print "DevMgr4_base.installDevice_activated(): Not implemented yet"
+ print("DevMgr4_base.installDevice_activated(): Not implemented yet")
def deviceInstallAction_activated(self):
- print "DevMgr4_base.deviceInstallAction_activated(): Not implemented yet"
+ print("DevMgr4_base.deviceInstallAction_activated(): Not implemented yet")
def deviceRemoveAction_activated(self):
- print "DevMgr4_base.deviceRemoveAction_activated(): Not implemented yet"
+ print("DevMgr4_base.deviceRemoveAction_activated(): Not implemented yet")
def Tabs_currentChanged(self,a0):
- print "DevMgr4_base.Tabs_currentChanged(QWidget*): Not implemented yet"
+ print("DevMgr4_base.Tabs_currentChanged(QWidget*): Not implemented yet")
def DeviceList_onItem(self,a0):
- print "DevMgr4_base.DeviceList_onItem(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.DeviceList_onItem(QIconViewItem*): Not implemented yet")
def iconList_doubleClicked(self,a0):
- print "DevMgr4_base.iconList_doubleClicked(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.iconList_doubleClicked(QIconViewItem*): Not implemented yet")
def iconList_rightButtonClicked(self,a0,a1):
- print "DevMgr4_base.iconList_rightButtonClicked(QIconViewItem*,const QPoint&): Not implemented yet"
+ print("DevMgr4_base.iconList_rightButtonClicked(QIconViewItem*,const QPoint&): Not implemented yet")
def iconList_clicked(self,a0):
- print "DevMgr4_base.iconList_clicked(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.iconList_clicked(QIconViewItem*): Not implemented yet")
def iconList_contextMenuRequested(self,a0,a1):
- print "DevMgr4_base.iconList_contextMenuRequested(QIconViewItem*,const QPoint&): Not implemented yet"
+ print("DevMgr4_base.iconList_contextMenuRequested(QIconViewItem*,const QPoint&): Not implemented yet")
def iconList_returnPressed(self,a0):
- print "DevMgr4_base.iconList_returnPressed(QIconViewItem*): Not implemented yet"
+ print("DevMgr4_base.iconList_returnPressed(QIconViewItem*): Not implemented yet")
def stopstartPushButton_clicked(self):
- print "DevMgr4_base.stopstartPushButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.stopstartPushButton_clicked(): Not implemented yet")
def rejectacceptPushButton_clicked(self):
- print "DevMgr4_base.rejectacceptPushButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.rejectacceptPushButton_clicked(): Not implemented yet")
def defaultPushButton_clicked(self):
- print "DevMgr4_base.defaultPushButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.defaultPushButton_clicked(): Not implemented yet")
def PrintJobPrinterCombo_activated(self,a0):
- print "DevMgr4_base.PrintJobPrinterCombo_activated(const QString&): Not implemented yet"
+ print("DevMgr4_base.PrintJobPrinterCombo_activated(const QString&): Not implemented yet")
def PrintSettingsPrinterCombo_activated(self,a0):
- print "DevMgr4_base.PrintSettingsPrinterCombo_activated(const QString&): Not implemented yet"
+ print("DevMgr4_base.PrintSettingsPrinterCombo_activated(const QString&): Not implemented yet")
def jobList_rightButtonClicked(self,a0,a1,a2):
- print "DevMgr4_base.jobList_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet"
+ print("DevMgr4_base.jobList_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet")
def jobList_clicked(self,a0):
- print "DevMgr4_base.jobList_clicked(QListViewItem*): Not implemented yet"
+ print("DevMgr4_base.jobList_clicked(QListViewItem*): Not implemented yet")
def infoToolButton_clicked(self):
- print "DevMgr4_base.infoToolButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.infoToolButton_clicked(): Not implemented yet")
def cancelToolButton_clicked(self):
- print "DevMgr4_base.cancelToolButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.cancelToolButton_clicked(): Not implemented yet")
def InstallPushButton_clicked(self):
- print "DevMgr4_base.InstallPushButton_clicked(): Not implemented yet"
+ print("DevMgr4_base.InstallPushButton_clicked(): Not implemented yet")
def jobList_contextMenuRequested(self,a0,a1,a2):
- print "DevMgr4_base.jobList_contextMenuRequested(QListViewItem*,const QPoint&,int): Not implemented yet"
+ print("DevMgr4_base.jobList_contextMenuRequested(QListViewItem*,const QPoint&,int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("DevMgr4_base",s,c)
diff -Nru hplip-3.14.6/ui/devmgr4.py hplip-3.15.2/ui/devmgr4.py
--- hplip-3.14.6/ui/devmgr4.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/devmgr4.py 2015-01-29 12:20:22.000000000 +0000
@@ -19,7 +19,7 @@
# Authors: Don Welch, Pete Parks, Naga Samrat Chowdary Narla,
#
-from __future__ import generators
+
# Std Lib
import sys
@@ -29,50 +29,51 @@
import select
import struct
import threading
-import Queue
import signal
# Local
+from base.sixext.moves import queue
from base.g import *
from base import device, utils, pml, maint, pkit, os_utils
+from base.sixext import to_unicode
from prnt import cups
from base.codes import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
from installer.core_install import *
# Qt
from qt import *
# Main form
-from devmgr4_base import DevMgr4_base
+from .devmgr4_base import DevMgr4_base
# Scrollviews
-from scrollview import ScrollView
-from scrollprintsettings import ScrollPrintSettingsView
+from .scrollview import ScrollView
+from .scrollprintsettings import ScrollPrintSettingsView
# Alignment and ColorCal forms
-from alignform import AlignForm
-from aligntype6form1 import AlignType6Form1
-from aligntype6form2 import AlignType6Form2
-from paperedgealignform import PaperEdgeAlignForm
-from colorcalform import ColorCalForm # Type 1 color cal
-from coloradjform import ColorAdjForm # Type 5 and 6 color adj
-from colorcalform2 import ColorCalForm2 # Type 2 color cal
-from colorcal4form import ColorCal4Form # Type 4 color cal
-from align10form import Align10Form # Type 10 and 11 alignment
-from align13form import Align13Form # Type 13 alignment
+from .alignform import AlignForm
+from .aligntype6form1 import AlignType6Form1
+from .aligntype6form2 import AlignType6Form2
+from .paperedgealignform import PaperEdgeAlignForm
+from .colorcalform import ColorCalForm # Type 1 color cal
+from .coloradjform import ColorAdjForm # Type 5 and 6 color adj
+from .colorcalform2 import ColorCalForm2 # Type 2 color cal
+from .colorcal4form import ColorCal4Form # Type 4 color cal
+from .align10form import Align10Form # Type 10 and 11 alignment
+from .align13form import Align13Form # Type 13 alignment
# Misc forms
-from loadpaperform import LoadPaperForm
-from settingsdialog import SettingsDialog
-from aboutdlg import AboutDlg
-from cleaningform import CleaningForm
-from cleaningform2 import CleaningForm2
-from waitform import WaitForm
-from faxsettingsform import FaxSettingsForm
-from nodevicesform import NoDevicesForm
-from settingsdialog import SettingsDialog
-from firmwaredialog import FirmwareDialog
+from .loadpaperform import LoadPaperForm
+from .settingsdialog import SettingsDialog
+from .aboutdlg import AboutDlg
+from .cleaningform import CleaningForm
+from .cleaningform2 import CleaningForm2
+from .waitform import WaitForm
+from .faxsettingsform import FaxSettingsForm
+from .nodevicesform import NoDevicesForm
+from .settingsdialog import SettingsDialog
+from .firmwaredialog import FirmwareDialog
# all in seconds
MIN_AUTO_REFRESH_RATE = 5
@@ -191,10 +192,10 @@
self.connect(self.okPushButton,SIGNAL("clicked()"),self.accept)
self.connect(self.passwordLineEdit,SIGNAL("returnPressed()"),self.accept)
def getUsername(self):
- return unicode(self.usernameLineEdit.text())
+ return to_unicode(self.usernameLineEdit.text())
def getPassword(self):
- return unicode(self.passwordLineEdit.text())
+ return to_unicode(self.passwordLineEdit.text())
def languageChange(self):
self.setCaption(self.__tr("HP Device Manager - Enter Username/Password"))
@@ -369,7 +370,7 @@
if dev.supported:
try:
dev.open()
- except Error, e:
+ except Error as e:
log.warn(e.msg)
time.sleep(0.1)
@@ -380,7 +381,7 @@
try:
dev.queryDevice()
- except Error, e:
+ except Error as e:
log.error("Query device error (%s)." % e.msg)
dev.error_state = ERROR_STATE_ERROR
@@ -449,8 +450,8 @@
# Update thread setup
- self.request_queue = Queue.Queue()
- self.response_queue = Queue.Queue()
+ self.request_queue = queue.Queue()
+ self.response_queue = queue.Queue()
self.update_thread = UpdateThread(self.response_queue, self.request_queue)
self.update_thread.start()
@@ -1183,15 +1184,15 @@
self.PrintSettingsPrinterCombo.insertItem(c.decode("utf-8"))
self.PrintJobPrinterCombo.insertItem(c.decode("utf-8"))
- self.cur_printer = unicode(self.PrintSettingsPrinterCombo.currentText())
+ self.cur_printer = to_unicode(self.PrintSettingsPrinterCombo.currentText())
def PrintSettingsPrinterCombo_activated(self, s):
- self.cur_printer = unicode(s)
+ self.cur_printer = to_unicode(s)
self.PrintJobPrinterCombo.setCurrentText(self.cur_printer.encode("latin1")) # TODO: ?
return self.PrinterCombo_activated(self.cur_printer)
def PrintJobPrinterCombo_activated(self, s):
- self.cur_printer = unicode(s)
+ self.cur_printer = to_unicode(s)
self.PrintSettingsPrinterCombo.setCurrentText(self.cur_printer.encode("latin1")) # TODO: ?
return self.PrinterCombo_activated(self.cur_printer)
@@ -1406,7 +1407,7 @@
for filter, text, icon, tooltip, cmd in self.ICONS:
if filter is not None:
- if not filter():
+ if not list(filter()):
continue
FuncViewItem(self.iconList, text,
@@ -2062,9 +2063,9 @@
tt = QString("%1 %2").arg(dt.toString()).arg(desc)
if e.job_id:
- job_id = unicode(e.job_id)
+ job_id = to_unicode(e.job_id)
else:
- job_id = u''
+ job_id = ''
error_state = STATUS_TO_ERROR_STATE_MAP.get(e.event_code, ERROR_STATE_CLEAR)
tech_type = self.cur_device.tech_type
@@ -2077,8 +2078,8 @@
except KeyError:
status_pix = self.STATUS_ICONS[ERROR_STATE_CLEAR][0]
- StatusListViewItem(self.statusListView, status_pix, ess, tt, unicode(e.event_code),
- job_id, unicode(e.username))
+ StatusListViewItem(self.statusListView, status_pix, ess, tt, to_unicode(e.event_code),
+ job_id, to_unicode(e.username))
row -= 1
@@ -2122,7 +2123,7 @@
try:
i18n_amount = self.num_repr[amount]
except KeyError:
- i18n_amount = unicode(amount)
+ i18n_amount = to_unicode(amount)
if amount == 1:
i18n_unit = self.unit_names[unit_name][0]
@@ -2496,13 +2497,13 @@
jobs = cups.getJobs()
num_jobs = 0
for j in jobs:
- if j.dest.decode('utf-8') == unicode(self.cur_printer):
+ if j.dest.decode('utf-8') == to_unicode(self.cur_printer):
num_jobs += 1
for j in jobs:
if j.dest == self.cur_printer:
JobListViewItem(self.jobList, self.JOB_STATE_ICONS[j.state],
- j.title, self.JOB_STATES[j.state], unicode(j.id))
+ j.title, self.JOB_STATES[j.state], to_unicode(j.id))
i = self.jobList.firstChild()
if i is not None:
@@ -2564,7 +2565,7 @@
if text:
dlg = JobInfoDialog(text, self)
dlg.setCaption(self.__tr("HP Device Manager - Job Log - %1 - Job %2").\
- arg(self.cur_printer).arg(unicode(item.job_id)))
+ arg(self.cur_printer).arg(to_unicode(item.job_id)))
dlg.exec_loop()
@@ -2701,7 +2702,7 @@
def defaultPushButton_clicked(self):
QApplication.setOverrideCursor(QApplication.waitCursor)
try:
- result, result_str = cups.cups_operation(cups.setDefaultPrinter, GUI_MODE, 'qt3', self, self.cur_printer.encode('utf8'))
+ result, result_str = cups.cups_operation(cups.setDefaultPrinter.encode('utf8'), GUI_MODE, 'qt3', self, self.cur_printer.encode('utf8'))
if result != cups.IPP_OK:
log.error("Set default printer failed.")
@@ -3005,16 +3006,16 @@
layout37.addMultiCellWidget(self.infoListView,1,1,0,3)
- mq_keys = self.cur_device.mq.keys()
+ mq_keys = list(self.cur_device.mq.keys())
mq_keys.sort()
mq_keys.reverse()
- for key,i in zip(mq_keys, range(len(mq_keys))):
+ for key,i in zip(mq_keys, list(range(len(mq_keys)))):
QListViewItem(self.infoListView, self.__tr("Static"), key, str(self.cur_device.mq[key]))
- dq_keys = self.cur_device.dq.keys()
+ dq_keys = list(self.cur_device.dq.keys())
dq_keys.sort()
dq_keys.reverse()
- for key,i in zip(dq_keys, range(len(dq_keys))):
+ for key,i in zip(dq_keys, list(range(len(dq_keys)))):
QListViewItem(self.infoListView, self.__tr("Dynamic"), key, str(self.cur_device.dq[key]))
self.addWidget(widget, "file_list", maximize=True)
diff -Nru hplip-3.14.6/ui/faxaddrbookeditform_base.py hplip-3.15.2/ui/faxaddrbookeditform_base.py
--- hplip-3.14.6/ui/faxaddrbookeditform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxaddrbookeditform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -173,25 +173,25 @@
def firstnameEdit_textChanged(self,a0):
- print "FaxAddrBookEditForm_base.firstnameEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxAddrBookEditForm_base.firstnameEdit_textChanged(const QString&): Not implemented yet")
def lastnameEdit_textChanged(self,a0):
- print "FaxAddrBookEditForm_base.lastnameEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxAddrBookEditForm_base.lastnameEdit_textChanged(const QString&): Not implemented yet")
def checkBox3_toggled(self,a0):
- print "FaxAddrBookEditForm_base.checkBox3_toggled(bool): Not implemented yet"
+ print("FaxAddrBookEditForm_base.checkBox3_toggled(bool): Not implemented yet")
def isGroupCheckBox_toggled(self,a0):
- print "FaxAddrBookEditForm_base.isGroupCheckBox_toggled(bool): Not implemented yet"
+ print("FaxAddrBookEditForm_base.isGroupCheckBox_toggled(bool): Not implemented yet")
def groupsButton2_clicked(self):
- print "FaxAddrBookEditForm_base.groupsButton2_clicked(): Not implemented yet"
+ print("FaxAddrBookEditForm_base.groupsButton2_clicked(): Not implemented yet")
def nicknameEdit_textChanged(self,a0):
- print "FaxAddrBookEditForm_base.nicknameEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxAddrBookEditForm_base.nicknameEdit_textChanged(const QString&): Not implemented yet")
def faxEdit_textChanged(self,a0):
- print "FaxAddrBookEditForm_base.faxEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxAddrBookEditForm_base.faxEdit_textChanged(const QString&): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("FaxAddrBookEditForm_base",s,c)
diff -Nru hplip-3.14.6/ui/faxaddrbookform_base.py hplip-3.15.2/ui/faxaddrbookform_base.py
--- hplip-3.14.6/ui/faxaddrbookform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxaddrbookform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -121,28 +121,28 @@
def newButton_clicked(self):
- print "FaxAddrBookForm_base.newButton_clicked(): Not implemented yet"
+ print("FaxAddrBookForm_base.newButton_clicked(): Not implemented yet")
def editButton_clicked(self):
- print "FaxAddrBookForm_base.editButton_clicked(): Not implemented yet"
+ print("FaxAddrBookForm_base.editButton_clicked(): Not implemented yet")
def deleteButton_clicked(self):
- print "FaxAddrBookForm_base.deleteButton_clicked(): Not implemented yet"
+ print("FaxAddrBookForm_base.deleteButton_clicked(): Not implemented yet")
def addressListView_rightButtonClicked(self,a0,a1,a2):
- print "FaxAddrBookForm_base.addressListView_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet"
+ print("FaxAddrBookForm_base.addressListView_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet")
def addressListView_currentChanged(self,a0):
- print "FaxAddrBookForm_base.addressListView_currentChanged(QListViewItem*): Not implemented yet"
+ print("FaxAddrBookForm_base.addressListView_currentChanged(QListViewItem*): Not implemented yet")
def addressListView_doubleClicked(self,a0):
- print "FaxAddrBookForm_base.addressListView_doubleClicked(QListViewItem*): Not implemented yet"
+ print("FaxAddrBookForm_base.addressListView_doubleClicked(QListViewItem*): Not implemented yet")
def groupButton_clicked(self):
- print "FaxAddrBookForm_base.groupButton_clicked(): Not implemented yet"
+ print("FaxAddrBookForm_base.groupButton_clicked(): Not implemented yet")
def importPushButton_clicked(self):
- print "FaxAddrBookForm_base.importPushButton_clicked(): Not implemented yet"
+ print("FaxAddrBookForm_base.importPushButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("FaxAddrBookForm_base",s,c)
diff -Nru hplip-3.14.6/ui/faxaddrbookform.py hplip-3.15.2/ui/faxaddrbookform.py
--- hplip-3.14.6/ui/faxaddrbookform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxaddrbookform.py 2015-01-29 12:20:22.000000000 +0000
@@ -27,7 +27,8 @@
# Local
from base.g import *
from base import utils
-from ui_utils import load_pixmap
+from base.sixext import to_unicode
+from .ui_utils import load_pixmap
try:
from fax import fax
@@ -38,10 +39,10 @@
# Qt
from qt import *
-from faxaddrbookform_base import FaxAddrBookForm_base
-from faxaddrbookeditform_base import FaxAddrBookEditForm_base
-from faxaddrbookgroupsform_base import FaxAddrBookGroupsForm_base
-from faxaddrbookgroupeditform_base import FaxAddrBookGroupEditForm_base
+from .faxaddrbookform_base import FaxAddrBookForm_base
+from .faxaddrbookeditform_base import FaxAddrBookEditForm_base
+from .faxaddrbookgroupsform_base import FaxAddrBookGroupsForm_base
+from .faxaddrbookgroupeditform_base import FaxAddrBookGroupEditForm_base
# globals
db = None
@@ -66,8 +67,8 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
- if input.find(u',') > 0:
+ input = to_unicode(input)
+ if input.find(',') > 0:
return QValidator.Invalid, pos
elif len(input) > 50:
return QValidator.Invalid, pos
@@ -80,10 +81,10 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
if not input:
return QValidator.Acceptable, pos
- elif input[pos-1] not in u'0123456789-(+) *#':
+ elif input[pos-1] not in '0123456789-(+) *#':
return QValidator.Invalid, pos
elif len(input) > 50:
return QValidator.Invalid, pos
@@ -114,7 +115,7 @@
self.entriesListView.clear()
all_entries = db.get_all_records()
- for e, v in all_entries.items():
+ for e, v in list(all_entries.items()):
i = QCheckListItem(self.entriesListView, e, QCheckListItem.CheckBox)
if group_name and group_name in v['groups']:
@@ -124,14 +125,14 @@
def getDlgData(self):
- group_name = unicode(self.groupnameEdit.text())
+ group_name = to_unicode(self.groupnameEdit.text())
entries = []
i = self.entriesListView.firstChild()
while i is not None:
if i.isOn():
- entries.append(unicode(i.text()))
+ entries.append(to_unicode(i.text()))
i = i.itemBelow()
@@ -144,7 +145,7 @@
self.CheckOKButton()
def CheckOKButton(self):
- group_name = unicode(self.groupnameEdit.text())
+ group_name = to_unicode(self.groupnameEdit.text())
if not group_name or \
(not self.edit_mode and group_name in self.all_groups):
@@ -190,7 +191,7 @@
for group in all_groups:
i = QListViewItem(self.groupListView, group,
- u', '.join(db.group_members(group)))
+ ', '.join(db.group_members(group)))
if first_rec is None:
first_rec = i
@@ -215,7 +216,7 @@
def editButton_clicked(self):
dlg = FaxAddrBookGroupEditForm(self)
- group_name = unicode(self.current.text(0))
+ group_name = to_unicode(self.current.text(0))
dlg.setDlgData(group_name)
if dlg.exec_loop() == QDialog.Accepted:
group_name, entries = dlg.getDlgData()
@@ -231,7 +232,7 @@
QMessageBox.No | QMessageBox.Default,
QMessageBox.NoButton)
if x == QMessageBox.Yes:
- db.delete_group(unicode(self.current.text(0)))
+ db.delete_group(to_unicode(self.current.text(0)))
self.UpdateList()
def groupListView_currentChanged(self, a0):
@@ -293,16 +294,16 @@
while i is not None:
if i.isOn():
- in_groups.append(unicode(i.text()))
+ in_groups.append(to_unicode(i.text()))
i = i.itemBelow()
- return {'name': unicode(self.nicknameEdit.text()),
- 'title': unicode(self.titleEdit.text()),
- 'firstname': unicode(self.firstnameEdit.text()),
- 'lastname': unicode(self.lastnameEdit.text()),
- 'fax': unicode(self.faxEdit.text()),
+ return {'name': to_unicode(self.nicknameEdit.text()),
+ 'title': to_unicode(self.titleEdit.text()),
+ 'firstname': to_unicode(self.firstnameEdit.text()),
+ 'lastname': to_unicode(self.lastnameEdit.text()),
+ 'fax': to_unicode(self.faxEdit.text()),
'groups': in_groups,
- 'notes': unicode(self.notesEdit.text())}
+ 'notes': to_unicode(self.notesEdit.text())}
def firstnameEdit_textChanged(self,a0):
pass
@@ -318,16 +319,16 @@
def CheckOKButton(self, nickname=None, fax=None):
if nickname is None:
- nickname = unicode(self.nicknameEdit.text())
+ nickname = to_unicode(self.nicknameEdit.text())
if fax is None:
- fax = unicode(self.faxEdit.text())
+ fax = to_unicode(self.faxEdit.text())
ok = bool(len(nickname) and len(fax))
if nickname:
all_entries = db.get_all_records()
- for e, v in all_entries.items():
+ for e, v in list(all_entries.items()):
if nickname == e and nickname != self.initial_nickname:
ok = False
@@ -365,7 +366,7 @@
log.debug("Number of records is: %d" % len(all_entries))
if all_entries:
- for e, v in all_entries.items():
+ for e, v in list(all_entries.items()):
if v['name'].startswith('__'):
continue
@@ -446,7 +447,7 @@
self.current = item
def FailureUI(self, error_text):
- log.error(unicode(error_text).replace("", "").replace("", "").replace("", " "))
+ log.error(to_unicode(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.critical(self,
self.caption(),
QString(error_text),
@@ -474,7 +475,7 @@
if dlg.exec_loop() == QDialog.Accepted:
result = str(dlg.selectedFile())
- working_directory = unicode(dlg.dir().absPath())
+ working_directory = to_unicode(dlg.dir().absPath())
log.debug("result: %s" % result)
user_conf.setWorkingDirectory(working_directory)
diff -Nru hplip-3.14.6/ui/faxaddrbookgroupeditform_base.py hplip-3.15.2/ui/faxaddrbookgroupeditform_base.py
--- hplip-3.14.6/ui/faxaddrbookgroupeditform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxaddrbookgroupeditform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -78,10 +78,10 @@
def groupnameEdit_textChanged(self,a0):
- print "FaxAddrBookGroupEditForm_base.groupnameEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxAddrBookGroupEditForm_base.groupnameEdit_textChanged(const QString&): Not implemented yet")
def entriesListView_clicked(self,a0):
- print "FaxAddrBookGroupEditForm_base.entriesListView_clicked(QListViewItem*): Not implemented yet"
+ print("FaxAddrBookGroupEditForm_base.entriesListView_clicked(QListViewItem*): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("FaxAddrBookGroupEditForm_base",s,c)
diff -Nru hplip-3.14.6/ui/faxaddrbookgroupsform_base.py hplip-3.15.2/ui/faxaddrbookgroupsform_base.py
--- hplip-3.14.6/ui/faxaddrbookgroupsform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxaddrbookgroupsform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -77,22 +77,22 @@
def newButton_clicked(self):
- print "FaxAddrBookGroupsForm_base.newButton_clicked(): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.newButton_clicked(): Not implemented yet")
def editButton_clicked(self):
- print "FaxAddrBookGroupsForm_base.editButton_clicked(): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.editButton_clicked(): Not implemented yet")
def deleteButton_clicked(self):
- print "FaxAddrBookGroupsForm_base.deleteButton_clicked(): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.deleteButton_clicked(): Not implemented yet")
def groupListView_currentChanged(self,a0):
- print "FaxAddrBookGroupsForm_base.groupListView_currentChanged(QListViewItem*): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.groupListView_currentChanged(QListViewItem*): Not implemented yet")
def groupListView_doubleClicked(self,a0):
- print "FaxAddrBookGroupsForm_base.groupListView_doubleClicked(QListViewItem*): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.groupListView_doubleClicked(QListViewItem*): Not implemented yet")
def groupListView_rightButtonClicked(self,a0,a1,a2):
- print "FaxAddrBookGroupsForm_base.groupListView_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet"
+ print("FaxAddrBookGroupsForm_base.groupListView_rightButtonClicked(QListViewItem*,const QPoint&,int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("FaxAddrBookGroupsForm_base",s,c)
diff -Nru hplip-3.14.6/ui/faxsendjobform.py hplip-3.15.2/ui/faxsendjobform.py
--- hplip-3.14.6/ui/faxsendjobform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxsendjobform.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,8 +26,9 @@
from base.g import *
from base.codes import *
from base import utils, device
+from base.sixext import to_unicode
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
if 1:
#try:
@@ -41,7 +42,7 @@
# Qt/UI
from qt import *
-from scrollfax import ScrollFaxView
+from .scrollfax import ScrollFaxView
# dBus
dbus_avail = False
@@ -132,7 +133,7 @@
#print devices
if x == 0:
- from nodevicesform import NoDevicesForm
+ from .nodevicesform import NoDevicesForm
self.FailureUI(self.__tr("
No devices found.
Please make sure your device is properly installed and try again."))
self.init_failed = True
@@ -141,7 +142,7 @@
self.device_uri = devices[0][0]
else:
- from chooseprinterdlg import ChoosePrinterDlg
+ from .chooseprinterdlg import ChoosePrinterDlg
dlg = ChoosePrinterDlg(self.cups_printers, ['hpfax'])
if dlg.exec_loop() == QDialog.Accepted:
@@ -164,7 +165,7 @@
try:
self.cur_device = device.Device(device_uri=self.device_uri,
printer_name=self.printer_name)
- except Error, e:
+ except Error as e:
log.error("Invalid device URI or printer name.")
self.FailureUI("Invalid device URI or printer name.
Please check the parameters to hp-print and try again.")
self.init_failed = True
@@ -214,7 +215,7 @@
QMessageBox.NoButton)
def FailureUI(self, error_text):
- log.error(unicode(error_text).replace("", "").replace("", "").replace("
", " "))
+ log.error(to_unicode(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.critical(self,
self.caption(),
error_text,
@@ -223,7 +224,7 @@
QMessageBox.NoButton)
def WarningUI(self, error_text):
- log.warn(unicode(error_text).replace("", "").replace("", "").replace("
", " "))
+ log.warn(to_unicode(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.warning(self,
self.caption(),
error_text,
diff -Nru hplip-3.14.6/ui/faxsettingsform_base.py hplip-3.15.2/ui/faxsettingsform_base.py
--- hplip-3.14.6/ui/faxsettingsform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxsettingsform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -148,10 +148,10 @@
def faxEdit_textChanged(self,a0):
- print "FaxSettingsForm_base.faxEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxSettingsForm_base.faxEdit_textChanged(const QString&): Not implemented yet")
def nameEdit_textChanged(self,a0):
- print "FaxSettingsForm_base.nameEdit_textChanged(const QString&): Not implemented yet"
+ print("FaxSettingsForm_base.nameEdit_textChanged(const QString&): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("FaxSettingsForm_base",s,c)
diff -Nru hplip-3.14.6/ui/faxsettingsform.py hplip-3.15.2/ui/faxsettingsform.py
--- hplip-3.14.6/ui/faxsettingsform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/faxsettingsform.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,16 +22,17 @@
from qt import *
-from faxsettingsform_base import FaxSettingsForm_base
+from .faxsettingsform_base import FaxSettingsForm_base
from base.g import *
from base import device, pml, utils
+from base.sixext import to_unicode
class PhoneNumValidator(QValidator):
def __init__(self, parent=None, name=None):
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
try:
input = input.encode('ascii')
except UnicodeEncodeError:
@@ -52,7 +53,7 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
try:
input = input.encode('ascii')
@@ -95,8 +96,8 @@
if toggle is not None:
self.pushButtonOK.setEnabled(bool(toggle))
else:
- name = unicode(self.nameEdit.text())
- fax_num = unicode(self.faxEdit.text())
+ name = to_unicode(self.nameEdit.text())
+ fax_num = to_unicode(self.faxEdit.text())
self.pushButtonOK.setEnabled(bool(name and fax_num))
def accept(self):
@@ -113,7 +114,7 @@
# TODO: This is a problem - user can enter non-ascii chars...
# user config needs to be in utf-8 encoding (but its not right now)
- user_conf.set('fax', 'voice_phone', unicode(self.voiceEdit.text()).encode('utf-8'))
- user_conf.set('fax', 'email_address', unicode(self.emailEdit.text()).encode('utf-8'))
+ user_conf.set('fax', 'voice_phone', to_unicode(self.voiceEdit.text()).encode('utf-8'))
+ user_conf.set('fax', 'email_address', to_unicode(self.emailEdit.text()).encode('utf-8'))
FaxSettingsForm_base.accept(self)
diff -Nru hplip-3.14.6/ui/firmwaredialog_base.py hplip-3.15.2/ui/firmwaredialog_base.py
--- hplip-3.14.6/ui/firmwaredialog_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/firmwaredialog_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -12,12 +12,12 @@
from qt import *
-from deviceuricombobox import DeviceUriComboBox
+from .deviceuricombobox import DeviceUriComboBox
class FirmwareDialog_Base(object):
def setupUi(self,Dialog):
- Dialog.setModal(True)
+ Dialog.setModal(True)
Dialog.setName("FirmwareDialog_Base")
self.Download_Firmwar = QLabel(Dialog,"Download_Firmware")
diff -Nru hplip-3.14.6/ui/firmwaredialog.py hplip-3.15.2/ui/firmwaredialog.py
--- hplip-3.14.6/ui/firmwaredialog.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/firmwaredialog.py 2015-01-29 12:20:22.000000000 +0000
@@ -28,22 +28,22 @@
from base import device, utils
from prnt import cups
from base.codes import *
-from ui_utils import *
+from .ui_utils import *
# Qt
from qt import *
# Ui
-from firmwaredialog_base import FirmwareDialog_Base
+from .firmwaredialog_base import FirmwareDialog_Base
class FirmwareDialog(QDialog, FirmwareDialog_Base):
def __init__(self, parent, device_uri):
- QDialog.__init__(self, parent)
- self.setupUi(self)
- self.device_uri = device_uri
+ QDialog.__init__(self, parent)
+ self.setupUi(self)
+ self.device_uri = device_uri
self.initUi()
QTimer.singleShot(0, self.updateUi)
-
+
def initUi(self):
self.DeviceComboBox.setFilter({'fw-download' : (operator.gt, 0)})
self.DeviceComboBox.setParent(self)
@@ -52,7 +52,7 @@
signal.signal(signal.SIGINT, signal.SIG_DFL)
# Application icon
- self.setIcon(load_pixmap('hp_logo', '128x128'))
+ self.setIcon(load_pixmap('hp_logo', '128x128'))
if self.device_uri:
self.DeviceComboBox.setInitialDevice(self.device_uri)
@@ -107,11 +107,11 @@
def FailureUI(self, error_text):
QMessageBox.critical(self,
- self.caption(),
- error_text,
- QMessageBox.Ok,
- QMessageBox.NoButton,
- QMessageBox.NoButton)
+ self.caption(),
+ error_text,
+ QMessageBox.Ok,
+ QMessageBox.NoButton,
+ QMessageBox.NoButton)
def CheckDeviceUI(self):
diff -Nru hplip-3.14.6/ui/imagepropertiesdlg_base.py hplip-3.15.2/ui/imagepropertiesdlg_base.py
--- hplip-3.14.6/ui/imagepropertiesdlg_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/imagepropertiesdlg_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -97,7 +97,7 @@
def ViewEXIFButton_clicked(self):
- print "ImagePropertiesDlg_base.ViewEXIFButton_clicked(): Not implemented yet"
+ print("ImagePropertiesDlg_base.ViewEXIFButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("ImagePropertiesDlg_base",s,c)
diff -Nru hplip-3.14.6/ui/imagepropertiesdlg.py hplip-3.15.2/ui/imagepropertiesdlg.py
--- hplip-3.14.6/ui/imagepropertiesdlg.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/imagepropertiesdlg.py 2015-01-29 12:20:22.000000000 +0000
@@ -21,7 +21,7 @@
import sys
from qt import *
-from imagepropertiesdlg_base import ImagePropertiesDlg_base
+from .imagepropertiesdlg_base import ImagePropertiesDlg_base
class ImagePropertiesDlg(ImagePropertiesDlg_base):
def __init__(self, filename, location, mimetype, size, exif_info={}, parent = None,name = None,modal = 0,fl = 0):
diff -Nru hplip-3.14.6/ui/jobstoragemixin.py hplip-3.15.2/ui/jobstoragemixin.py
--- hplip-3.14.6/ui/jobstoragemixin.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/jobstoragemixin.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,6 +23,7 @@
from base.g import *
from base import utils
from prnt import cups
+from base.sixext import to_unicode
# Qt
from qt import *
@@ -32,8 +33,8 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- for x in unicode(input)[pos-1:]:
- if x not in u'0123456789':
+ for x in to_unicode(input)[pos-1:]:
+ if x not in '0123456789':
return QValidator.Invalid, pos
return QValidator.Acceptable, pos
@@ -43,8 +44,8 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- for x in unicode(input)[pos-1:]:
- if x not in u'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ -':
+ for x in to_unicode(input)[pos-1:]:
+ if x not in '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ -':
return QValidator.Invalid, pos
return QValidator.Acceptable, pos
@@ -57,11 +58,11 @@
def initJobStorage(self, print_settings_mode=False):
self.print_settings_mode = print_settings_mode
self.job_storage_mode = JOB_STORAGE_TYPE_OFF
- self.job_storage_pin = u"0000"
+ self.job_storage_pin = "0000"
self.job_storage_use_pin = False
- self.job_storage_username = unicode(prop.username[:16])
+ self.job_storage_username = to_unicode(prop.username[:16])
self.job_storage_auto_username = True
- self.job_storage_jobname = u"Untitled"
+ self.job_storage_jobname = "Untitled"
self.job_storage_auto_jobname = True
self.job_storage_job_exist = 0
@@ -80,13 +81,13 @@
current_options = dict(cups.getOptions())
cups.closePPD()
- self.job_storage_pin = unicode(current_options.get('HOLDKEY', '0000')[:4])
+ self.job_storage_pin = to_unicode(current_options.get('HOLDKEY', '0000')[:4])
self.jobStoragePINEdit.setText(self.job_storage_pin)
- self.job_storage_username = unicode(current_options.get('USERNAME', prop.username)[:16])
+ self.job_storage_username = to_unicode(current_options.get('USERNAME', prop.username)[:16])
self.jobStorageUsernameEdit.setText(self.job_storage_username)
- self.job_storage_jobname = unicode(current_options.get('JOBNAME', u"Untitled")[:16])
+ self.job_storage_jobname = to_unicode(current_options.get('JOBNAME', "Untitled")[:16])
self.jobStorageIDEdit.setText(self.job_storage_jobname)
hold = current_options.get('HOLD', 'OFF')
@@ -368,14 +369,14 @@
self.jobStoragePINDefaultPushButton.setEnabled(False)
self.jobStoragePINEdit.setEnabled(False)
self.job_storage_use_pin = False
- self.job_storage_pin = u"0000"
+ self.job_storage_pin = "0000"
self.setPrinterOptionPIN()
else: # On/Private/Use PIN
self.jobStoragePINDefaultPushButton.setEnabled(True)
self.jobStoragePINEdit.setEnabled(True)
self.job_storage_use_pin = True
- self.job_storage_pin = unicode(self.jobStoragePINEdit.text())
+ self.job_storage_pin = to_unicode(self.jobStoragePINEdit.text())
self.setPrinterOptionPIN()
def setPrinterOptionPIN(self):
@@ -394,7 +395,7 @@
pass
def jobStoragePINEdit_textChanged(self, a):
- self.job_storage_pin = unicode(a)
+ self.job_storage_pin = to_unicode(a)
self.setPrinterOptionPIN()
def jobStoragePINDefaultPushButton_clicked(self):
@@ -466,14 +467,14 @@
self.jobStorageUsernameDefaultPushButton.setEnabled(False)
self.jobStorageUsernameEdit.setEnabled(False)
self.job_storage_auto_username = True
- self.job_storage_username = unicode(prop.username[:16])
+ self.job_storage_username = to_unicode(prop.username[:16])
self.setPrinterOptionUsername()
else: # Custom
self.jobStorageUsernameDefaultPushButton.setEnabled(True)
self.jobStorageUsernameEdit.setEnabled(True)
self.job_storage_auto_username = False
- self.job_storage_username = unicode(self.jobStorageUsernameEdit.text())
+ self.job_storage_username = to_unicode(self.jobStorageUsernameEdit.text())
self.setPrinterOptionUsername()
def jobStorageUsernameEdit_lostFocus(self):
@@ -481,7 +482,7 @@
pass
def jobStorageUsernameEdit_textChanged(self, a):
- self.job_storage_username = unicode(a)
+ self.job_storage_username = to_unicode(a)
self.setPrinterOptionUsername()
def jobStorageUsernameDefaultPushButton_clicked(self):
@@ -489,7 +490,7 @@
self.jobStorageUsernameDefaultPushButton.setEnabled(False)
self.jobStorageUsernameEdit.setEnabled(False)
self.job_storage_auto_username = True
- self.job_storage_username = unicode(prop.username[:16])
+ self.job_storage_username = to_unicode(prop.username[:16])
self.setPrinterOptionUsername()
def setPrinterOptionUsername(self):
@@ -560,14 +561,14 @@
self.jobStorageIDDefaultPushButton.setEnabled(False)
self.jobStorageIDEdit.setEnabled(False)
self.job_storage_auto_jobname = True
- self.job_storage_jobname = u"Untitled"
+ self.job_storage_jobname = "Untitled"
self.setPrinterOptionID()
else: # Custom
self.jobStorageIDDefaultPushButton.setEnabled(True)
self.jobStorageIDEdit.setEnabled(True)
self.job_storage_auto_jobname = False
- self.job_storage_jobname = unicode(self.jobStorageIDEdit.text())
+ self.job_storage_jobname = to_unicode(self.jobStorageIDEdit.text())
self.setPrinterOptionID()
def jobStorageIDEdit_lostFocus(self):
@@ -575,7 +576,7 @@
pass
def jobStorageIDEdit_textChanged(self, a):
- self.job_storage_jobname = unicode(a)
+ self.job_storage_jobname = to_unicode(a)
self.setPrinterOptionID()
def jobStorageIDDefaultPushButton_clicked(self):
@@ -583,7 +584,7 @@
self.jobStorageIDDefaultPushButton.setEnabled(False)
self.jobStorageIDEdit.setEnabled(False)
self.job_storage_auto_jobname = True
- self.job_storage_jobname = u"Untitled"
+ self.job_storage_jobname = "Untitled"
self.setPrinterOptionID()
def setPrinterOptionID(self):
diff -Nru hplip-3.14.6/ui/loadpaperform.py hplip-3.15.2/ui/loadpaperform.py
--- hplip-3.14.6/ui/loadpaperform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/loadpaperform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
# Local
from base.g import *
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from loadpaperform_base import LoadPaperForm_base
+from .loadpaperform_base import LoadPaperForm_base
class LoadPaperForm(LoadPaperForm_base):
diff -Nru hplip-3.14.6/ui/makecopiesform.py hplip-3.15.2/ui/makecopiesform.py
--- hplip-3.14.6/ui/makecopiesform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/makecopiesform.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,11 +26,11 @@
from prnt import cups
from base import device, utils, pml
from copier import copier
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from scrollcopy import ScrollCopyView
+from .scrollcopy import ScrollCopyView
class MakeCopiesForm(QMainWindow):
def __init__(self, bus='cups', device_uri=None, printer_name=None,
@@ -88,7 +88,7 @@
max_deviceid_size = max(len(d), max_deviceid_size)
if x == 0:
- from nodevicesform import NoDevicesForm
+ from .nodevicesform import NoDevicesForm
self.FailureUI(self.__tr("
No devices found.
Please make sure your device is properly installed and try again."))
self.init_failed = True
@@ -98,7 +98,7 @@
else:
- from choosedevicedlg import ChooseDeviceDlg
+ from .choosedevicedlg import ChooseDeviceDlg
dlg = ChooseDeviceDlg(devices) #, ['hp'])
if dlg.exec_loop() == QDialog.Accepted:
diff -Nru hplip-3.14.6/ui/nodevicesform_base.py hplip-3.15.2/ui/nodevicesform_base.py
--- hplip-3.14.6/ui/nodevicesform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/nodevicesform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -76,13 +76,13 @@
def CUPSButton_clicked(self):
- print "NoDevicesForm_base.CUPSButton_clicked(): Not implemented yet"
+ print("NoDevicesForm_base.CUPSButton_clicked(): Not implemented yet")
def ExitButton_clicked(self):
- print "NoDevicesForm_base.ExitButton_clicked(): Not implemented yet"
+ print("NoDevicesForm_base.ExitButton_clicked(): Not implemented yet")
def setupPushButton_clicked(self):
- print "NoDevicesForm_base.setupPushButton_clicked(): Not implemented yet"
+ print("NoDevicesForm_base.setupPushButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("NoDevicesForm_base",s,c)
diff -Nru hplip-3.14.6/ui/nodevicesform.py hplip-3.15.2/ui/nodevicesform.py
--- hplip-3.14.6/ui/nodevicesform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/nodevicesform.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,11 +26,11 @@
from base.g import *
from base import utils
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from nodevicesform_base import NoDevicesForm_base
+from .nodevicesform_base import NoDevicesForm_base
diff -Nru hplip-3.14.6/ui/paperedgealignform_base.py hplip-3.15.2/ui/paperedgealignform_base.py
--- hplip-3.14.6/ui/paperedgealignform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/paperedgealignform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -129,7 +129,7 @@
def buttonGroup_clicked(self,a0):
- print "PaperEdgeAlignForm_base.buttonGroup_clicked(int): Not implemented yet"
+ print("PaperEdgeAlignForm_base.buttonGroup_clicked(int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("PaperEdgeAlignForm_base",s,c)
diff -Nru hplip-3.14.6/ui/paperedgealignform.py hplip-3.15.2/ui/paperedgealignform.py
--- hplip-3.14.6/ui/paperedgealignform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/paperedgealignform.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,11 +23,11 @@
from base.g import *
# Local
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from paperedgealignform_base import PaperEdgeAlignForm_base
+from .paperedgealignform_base import PaperEdgeAlignForm_base
diff -Nru hplip-3.14.6/ui/pluginform2_base.py hplip-3.15.2/ui/pluginform2_base.py
--- hplip-3.14.6/ui/pluginform2_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/pluginform2_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -107,19 +107,19 @@
def sourceGroup_clicked(self,a0):
- print "PluginForm2_base.sourceGroup_clicked(int): Not implemented yet"
+ print("PluginForm2_base.sourceGroup_clicked(int): Not implemented yet")
def browsePushButton_clicked(self):
- print "PluginForm2_base.browsePushButton_clicked(): Not implemented yet"
+ print("PluginForm2_base.browsePushButton_clicked(): Not implemented yet")
def pathLineEdit_textChanged(self,a0):
- print "PluginForm2_base.pathLineEdit_textChanged(const QString&): Not implemented yet"
+ print("PluginForm2_base.pathLineEdit_textChanged(const QString&): Not implemented yet")
def actionPushButton_clicked(self):
- print "PluginForm2_base.actionPushButton_clicked(): Not implemented yet"
+ print("PluginForm2_base.actionPushButton_clicked(): Not implemented yet")
def cancelPushButton_clicked(self):
- print "PluginForm2_base.cancelPushButton_clicked(): Not implemented yet"
+ print("PluginForm2_base.cancelPushButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("PluginForm2_base",s,c)
diff -Nru hplip-3.14.6/ui/pluginform2.py hplip-3.15.2/ui/pluginform2.py
--- hplip-3.14.6/ui/pluginform2.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/pluginform2.py 2015-01-29 12:20:22.000000000 +0000
@@ -21,11 +21,12 @@
from base.g import *
from base import device, utils
+from base.sixext import to_unicode
from installer import pluginhandler
from qt import *
-from pluginform2_base import PluginForm2_base
+from .pluginform2_base import PluginForm2_base
import signal
class PluginForm2(PluginForm2_base):
@@ -51,10 +52,10 @@
self.actionPushButton.setEnabled(True)
self.path = None
else: # path
- self.path = unicode(self.pathLineEdit.text())
+ self.path = to_unicode(self.pathLineEdit.text())
self.pathLineEdit.emit(SIGNAL("textChanged(const QString&)"), (self.path,))
- if self.path.startswith(u"http://"):
+ if self.path.startswith("http://"):
self.actionPushButton.setText(self.__tr("Download and Install"))
else:
self.actionPushButton.setText(self.__tr("Copy and Install"))
@@ -70,19 +71,19 @@
if dlg.exec_loop() == QDialog.Accepted:
results = dlg.selectedFile()
- working_directory = unicode(dlg.dir().absPath())
+ working_directory = to_unicode(dlg.dir().absPath())
log.debug("results: %s" % results)
user_conf.setWorkingDirectory(working_directory)
if results:
- self.path = unicode(results)
+ self.path = to_unicode(results)
self.pathLineEdit.setText(self.path)
def pathLineEdit_textChanged(self, path):
- path, ok = unicode(path), True
+ path, ok = to_unicode(path), True
- if not path.startswith(u'http://'):
+ if not path.startswith('http://'):
self.actionPushButton.setText(self.__tr("Copy and Install"))
if not path or not os.path.exists(path):
@@ -191,7 +192,7 @@
def plugin_install_callback(self, s):
- print s
+ print(s)
def cancelPushButton_clicked(self):
diff -Nru hplip-3.14.6/ui/pluginlicenseform.py hplip-3.15.2/ui/pluginlicenseform.py
--- hplip-3.14.6/ui/pluginlicenseform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/pluginlicenseform.py 2015-01-29 12:20:22.000000000 +0000
@@ -9,7 +9,7 @@
from qt import *
-from pluginlicenseform_base import PluginLicenseForm_base
+from .pluginlicenseform_base import PluginLicenseForm_base
class PluginLicenseForm(PluginLicenseForm_base):
def __init__(self, license_txt, parent=None, name=None, modal=0, fl=0):
diff -Nru hplip-3.14.6/ui/printerform.py hplip-3.15.2/ui/printerform.py
--- hplip-3.14.6/ui/printerform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/printerform.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,11 +26,11 @@
from base.codes import *
from base import utils, device
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from scrollprint import ScrollPrintView
+from .scrollprint import ScrollPrintView
@@ -84,7 +84,7 @@
max_deviceid_size = max(len(d), max_deviceid_size)
if x == 0:
- from nodevicesform import NoDevicesForm
+ from .nodevicesform import NoDevicesForm
self.FailureUI(self.__tr("
No devices found.
Please make sure your device is properly installed and try again."))
self.init_failed = True
@@ -93,7 +93,7 @@
self.device_uri = devices[0][0]
else:
- from chooseprinterdlg import ChoosePrinterDlg
+ from .chooseprinterdlg import ChoosePrinterDlg
dlg = ChoosePrinterDlg(self.cups_printers)
if dlg.exec_loop() == QDialog.Accepted:
self.printer_name = dlg.printer_name
@@ -118,7 +118,7 @@
try:
self.cur_device = device.Device(device_uri=self.device_uri,
printer_name=self.printer_name)
- except Error, e:
+ except Error as e:
log.error("Invalid device URI or printer name.")
self.FailureUI("Invalid device URI or printer name.
Please check the parameters to hp-print and try again.")
self.init_failed = True
@@ -150,7 +150,7 @@
def FailureUI(self, error_text):
- log.error(unicode(error_text).replace("", "").replace("", "").replace("
", " "))
+ log.error(str(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.critical(self,
self.caption(),
error_text,
diff -Nru hplip-3.14.6/ui/scrollcopy.py hplip-3.15.2/ui/scrollcopy.py
--- hplip-3.14.6/ui/scrollcopy.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollcopy.py 2015-01-29 12:20:22.000000000 +0000
@@ -23,15 +23,15 @@
from base.g import *
from base import utils, pml
from copier import copier
+from base.sixext.moves import queue
# Qt
from qt import *
-from scrollview import ScrollView, PixmapLabelButton
-from waitform import WaitForm
+from .scrollview import ScrollView, PixmapLabelButton
+from .waitform import WaitForm
# Std Lib
import os.path, os
-import Queue
class ScrollCopyView(ScrollView):
@@ -47,8 +47,8 @@
self.reduction = reduction
self.fit_to_page = fit_to_page
- self.update_queue = Queue.Queue() # UI updates from copy thread
- self.event_queue = Queue.Queue() # UI events to copy thread
+ self.update_queue = queue.Queue() # UI updates from copy thread
+ self.event_queue = queue.Queue() # UI events to copy thread
def getDeviceSettings(self):
QApplication.setOverrideCursor(QApplication.waitCursor)
@@ -442,7 +442,7 @@
while self.update_queue.qsize():
try:
status = self.update_queue.get(0)
- except Queue.Empty:
+ except queue.Empty:
break
if status == copier.STATUS_IDLE:
diff -Nru hplip-3.14.6/ui/scrollfax.py hplip-3.15.2/ui/scrollfax.py
--- hplip-3.14.6/ui/scrollfax.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollfax.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,18 +22,20 @@
# Local
from base.g import *
from base import utils, magic, pml, os_utils
+from base.sixext import to_unicode
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
+from base.sixext.moves import queue
# Qt
from qt import *
-from scrollview import ScrollView, PixmapLabelButton
-from allowabletypesdlg import AllowableTypesDlg
-from waitform import WaitForm
+from .scrollview import ScrollView, PixmapLabelButton
+from .allowabletypesdlg import AllowableTypesDlg
+from .waitform import WaitForm
# Std Lib
import os.path, os
-import struct, Queue, time
+import struct, time
fax_enabled = prop.fax_build
@@ -72,7 +74,7 @@
if fax_enabled and coverpages_enabled:
from fax import coverpages
- from coverpageform import CoverpageForm
+ from .coverpageform import CoverpageForm
# Used to store MIME types for files
@@ -97,10 +99,10 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
if not input:
return QValidator.Acceptable, pos
- elif input[pos-1] not in u'0123456789-(+) *#':
+ elif input[pos-1] not in '0123456789-(+) *#':
return QValidator.Invalid, pos
elif len(input) > 50:
return QValidator.Invalid, pos
@@ -128,8 +130,8 @@
self.cover_page_message = ''
self.cover_page_re = ''
self.cover_page_name = ''
- self.update_queue = Queue.Queue() # UI updates from send thread
- self.event_queue = Queue.Queue() # UI events (cancel) to send thread
+ self.update_queue = queue.Queue() # UI updates from send thread
+ self.event_queue = queue.Queue() # UI events (cancel) to send thread
self.prev_selected_file_path = ''
self.prev_selected_recipient = ''
self.preserve_formatting = False
@@ -614,12 +616,12 @@
if dlg.exec_loop() == QDialog.Accepted:
results = dlg.selectedFile()
- working_directory = unicode(dlg.dir().absPath())
+ working_directory = to_unicode(dlg.dir().absPath())
log.debug("results: %s" % results)
user_conf.setWorkingDirectory(working_directory)
if results:
- path = unicode(results)
+ path = to_unicode(results)
self.processFile(path)
@@ -707,8 +709,8 @@
if dlg.exec_loop() == QDialog.Accepted:
self.cover_page_func, cover_page_png = dlg.data
- self.cover_page_message = unicode(dlg.messageTextEdit.text())
- self.cover_page_re = unicode(dlg.regardingTextEdit.text())
+ self.cover_page_message = to_unicode(dlg.messageTextEdit.text())
+ self.cover_page_re = to_unicode(dlg.regardingTextEdit.text())
self.cover_page_name = dlg.coverpage_name
self.preserve_formatting = dlg.preserve_formatting
return True
@@ -857,7 +859,7 @@
popup.insertItem(QIconSet(load_pixmap('add_user', '16x16')),
self.__tr("Add Individual"), ind)
- for e, v in all_entries.items():
+ for e, v in list(all_entries.items()):
if not e.startswith('__'):
self.ind_map[ind.insertItem(QIconSet(load_pixmap('add_user', '16x16')), e, None)] = e
@@ -1026,10 +1028,10 @@
self.addWidget(widget, "recipient_add_from_fab")
def addIndividualPushButton_clicked(self):
- self.addRecipient(unicode(self.individualComboBox.currentText()))
+ self.addRecipient(to_unicode(self.individualComboBox.currentText()))
def addGroupPushButton_clicked(self):
- self.addRecipient(unicode(self.groupComboBox.currentText()), True)
+ self.addRecipient(to_unicode(self.groupComboBox.currentText()), True)
def addRecipient(self, name, is_group=False):
if is_group:
@@ -1050,7 +1052,7 @@
all_entries = self.db.get_all_records()
self.addIndividualPushButton.setEnabled(len(all_entries))
- for e, v in all_entries.items():
+ for e, v in list(all_entries.items()):
if not e.startswith('__'):
self.individualComboBox.insertItem(e)
@@ -1104,8 +1106,8 @@
def quickAddPushButton_clicked(self):
- name = unicode(self.quickAddNameLineEdit.text())
- self.db.set(name, u'', u'', u'', unicode(self.quickAddFaxLineEdit.text()), [], self.__tr('Added with Quick Add'))
+ name = to_unicode(self.quickAddNameLineEdit.text())
+ self.db.set(name, '', '', '', to_unicode(self.quickAddFaxLineEdit.text()), [], self.__tr('Added with Quick Add'))
self.db.save()
self.addRecipient(name)
@@ -1115,9 +1117,9 @@
def enableQuickAddButton(self, name=None, fax=None):
if name is None:
- name = unicode(self.quickAddNameLineEdit.text())
+ name = to_unicode(self.quickAddNameLineEdit.text())
if fax is None:
- fax = unicode(self.quickAddFaxLineEdit.text())
+ fax = to_unicode(self.quickAddFaxLineEdit.text())
existing_name = False
if name:
@@ -1141,11 +1143,11 @@
def quickAddNameLineEdit_textChanged(self, name):
- self.enableQuickAddButton(unicode(name))
+ self.enableQuickAddButton(to_unicode(name))
def quickAddFaxLineEdit_textChanged(self, fax):
- self.enableQuickAddButton(None, unicode(fax))
+ self.enableQuickAddButton(None, to_unicode(fax))
def checkSendFaxButton(self):
@@ -1172,12 +1174,12 @@
try:
try:
self.dev.open()
- except Error, e:
+ except Error as e:
log.warn(e.msg)
try:
self.dev.queryDevice(quick=True)
- except Error, e:
+ except Error as e:
log.error("Query device error (%s)." % e.msg)
self.dev.error_state = ERROR_STATE_ERROR
@@ -1211,7 +1213,7 @@
for f in self.file_list:
- log.debug(unicode(f))
+ log.debug(to_unicode(f))
self.busy = True
@@ -1242,7 +1244,7 @@
while self.update_queue.qsize():
try:
status, page_num, arg = self.update_queue.get(0)
- except Queue.Empty:
+ except queue.Empty:
break
if status == fax.STATUS_IDLE:
diff -Nru hplip-3.14.6/ui/scrollprint.py hplip-3.15.2/ui/scrollprint.py
--- hplip-3.14.6/ui/scrollprint.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollprint.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,14 +22,15 @@
# Local
from base.g import *
from base import utils, magic, os_utils
+from base.sixext import to_unicode
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from scrollview import ScrollView, PixmapLabelButton
-from allowabletypesdlg import AllowableTypesDlg
-from jobstoragemixin import JobStorageMixin
+from .scrollview import ScrollView, PixmapLabelButton
+from .allowabletypesdlg import AllowableTypesDlg
+from .jobstoragemixin import JobStorageMixin
# Std Lib
import os.path
@@ -41,8 +42,8 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- for x in unicode(input)[pos-1:]:
- if x not in u'0123456789,- ':
+ for x in to_unicode(input)[pos-1:]:
+ if x not in '0123456789,- ':
return QValidator.Invalid, pos
return QValidator.Acceptable, pos
@@ -342,12 +343,12 @@
if dlg.exec_loop() == QDialog.Accepted:
results = dlg.selectedFile()
- working_directory = unicode(dlg.dir().absPath())
+ working_directory = to_unicode(dlg.dir().absPath())
#log.debug("results: %s" % unicode(results))
user_conf.setWorkingDirectory(working_directory)
if results:
- self.addFile(unicode(results))
+ self.addFile(to_unicode(results))
def removeFile_clicked(self):
try:
@@ -484,7 +485,7 @@
def pageRangeEdit_lostFocus(self):
x = []
try:
- x = utils.expand_range(unicode(self.pageRangeEdit.text()))
+ x = utils.expand_range(to_unicode(self.pageRangeEdit.text()))
except ValueError:
log.error("Invalid page range entered.")
self.invalid_page_range = True
@@ -970,7 +971,7 @@
copies = int(self.copiesSpinBox.value())
all_pages = self.pages_button_group == 0
- page_range = unicode(self.pageRangeEdit.text())
+ page_range = to_unicode(self.pageRangeEdit.text())
page_set = int(self.pageSetComboBox.currentItem())
cups.resetOptions()
diff -Nru hplip-3.14.6/ui/scrollprintsettings.py hplip-3.15.2/ui/scrollprintsettings.py
--- hplip-3.14.6/ui/scrollprintsettings.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollprintsettings.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,12 +22,13 @@
# Local
from base.g import *
from base import utils
+from base.sixext import to_unicode
from prnt import cups
-from jobstoragemixin import JobStorageMixin
+from .jobstoragemixin import JobStorageMixin
# Qt
from qt import *
-from scrollview import ScrollView
+from .scrollview import ScrollView
# Std Lib
import os.path
@@ -39,8 +40,8 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- for x in unicode(input)[pos-1:]:
- if x not in u'0123456789,- ':
+ for x in to_unicode(input)[pos-1:]:
+ if x not in '0123456789,- ':
return QValidator.Invalid, pos
return QValidator.Acceptable, pos
@@ -520,7 +521,7 @@
cur_outputmode_dpi = cups.findPPDAttribute(quality_attr_name, cur_outputmode)
if cur_outputmode_dpi is not None:
log.debug("Adding Group: Summary outputmode is : %s" % cur_outputmode)
- log.debug("Adding Group: Summary outputmode dpi is : %s" % unicode (cur_outputmode_dpi))
+ log.debug("Adding Group: Summary outputmode dpi is : %s" % str (cur_outputmode_dpi))
self.addGroupHeading("summry", self.__tr("Summary"))
self.addItem("summry", "colorinput", self.__tr('Color Input / Black Render'),
cups.UI_INFO, cur_outputmode_dpi, [], 0)
@@ -547,7 +548,7 @@
def ComboBox_indexChanged(self, currentItem):
sender = self.sender()
- currentItem = unicode(currentItem)
+ currentItem = to_unicode(currentItem)
# Checking for summary control
labelPQValaue = getattr(self, 'PQValueLabel', None)
labelPQColorInput = getattr(self, 'PQColorInputLabel', None)
@@ -568,7 +569,7 @@
log.debug("Outputmode changed, setting value outputmode: %s" % currentItem)
def optionComboBox_activated(self, a):
- a = unicode(a)
+ a = to_unicode(a)
sender = self.sender()
choice = None
@@ -635,7 +636,7 @@
# determine printoutmode option combo enable state
c.setEnabled(True)
QToolTip.remove(c)
- a = unicode(c.currentText())
+ a = to_unicode(c.currentText())
# determine printoutmode default button state
link_choice = None
diff -Nru hplip-3.14.6/ui/scrollunload.py hplip-3.15.2/ui/scrollunload.py
--- hplip-3.14.6/ui/scrollunload.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollunload.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,13 +22,14 @@
# Local
from base.g import *
from base import utils, magic
+from base.sixext import to_unicode
from pcard import photocard
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from scrollview import ScrollView, PixmapLabelButton
-from imagepropertiesdlg import ImagePropertiesDlg
+from .scrollview import ScrollView, PixmapLabelButton
+from .imagepropertiesdlg import ImagePropertiesDlg
#from waitform import WaitForm
# Std Lib
@@ -117,7 +118,7 @@
try:
self.pc = photocard.PhotoCard(None, self.cur_device.device_uri, self.cur_printer)
- except Error, e:
+ except Error as e:
QApplication.restoreOverrideCursor()
self.form.FailureUI(self.__tr("An error occured: %s" % e[0]))
self.cleanup(EVENT_PCARD_UNABLE_TO_MOUNT)
@@ -486,7 +487,7 @@
self.addWidget(widget, "folder")
def UnloadDirectoryEdit_textChanged(self, dir):
- self.unload_dir = unicode(dir)
+ self.unload_dir = to_unicode(dir)
if not os.path.exists(self.unload_dir):
self.UnloadDirectoryEdit.setPaletteBackgroundColor(QColor(0xff, 0x99, 0x99))
@@ -495,7 +496,7 @@
def UnloadDirectoryBrowseButton_clicked(self):
old_dir = self.unload_dir
- self.unload_dir = unicode(QFileDialog.getExistingDirectory(self.unload_dir, self))
+ self.unload_dir = to_unicode(QFileDialog.getExistingDirectory(self.unload_dir, self))
if not len(self.unload_dir):
return
@@ -540,7 +541,7 @@
was_cancelled = False
self.busy = True
self.unloadButton.setEnabled(False)
- self.unload_dir = unicode(self.UnloadDirectoryEdit.text())
+ self.unload_dir = to_unicode(self.UnloadDirectoryEdit.text())
dir_error = False
try:
diff -Nru hplip-3.14.6/ui/scrollview.py hplip-3.15.2/ui/scrollview.py
--- hplip-3.14.6/ui/scrollview.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/scrollview.py 2015-01-29 12:20:22.000000000 +0000
@@ -25,7 +25,8 @@
from base.g import *
from prnt import cups
from base import device
-from ui_utils import load_pixmap
+from base.sixext import to_unicode
+from .ui_utils import load_pixmap
# Qt
from qt import *
@@ -179,7 +180,7 @@
if printer_name == self.cur_printer or printer_name is None:
return
- self.cur_printer = unicode(printer_name)
+ self.cur_printer = to_unicode(printer_name)
if self.cur_device is not None and self.cur_device.supported:
#self.isFax()
@@ -266,7 +267,7 @@
layout.addWidget(textLabel2, 0, 0)
- self.addWidget(widget, "g:"+unicode(group))
+ self.addWidget(widget, "g:"+to_unicode(group))
def addActionButton(self, name, action_text, action_func,
diff -Nru hplip-3.14.6/ui/settingsdialog_base.py hplip-3.15.2/ui/settingsdialog_base.py
--- hplip-3.14.6/ui/settingsdialog_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/settingsdialog_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -235,58 +235,58 @@
def PrintCmdChangeButton_clicked(self):
- print "SettingsDialog_base.PrintCmdChangeButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.PrintCmdChangeButton_clicked(): Not implemented yet")
def ScanCmdChangeButton_clicked(self):
- print "SettingsDialog_base.ScanCmdChangeButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.ScanCmdChangeButton_clicked(): Not implemented yet")
def AccessPCardCmdChangeButton_clicked(self):
- print "SettingsDialog_base.AccessPCardCmdChangeButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.AccessPCardCmdChangeButton_clicked(): Not implemented yet")
def SendFaxCmdChangeButton_clicked(self):
- print "SettingsDialog_base.SendFaxCmdChangeButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.SendFaxCmdChangeButton_clicked(): Not implemented yet")
def MakeCopiesCmdChangeButton_clicked(self):
- print "SettingsDialog_base.MakeCopiesCmdChangeButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.MakeCopiesCmdChangeButton_clicked(): Not implemented yet")
def CleaningLevel_clicked(self,a0):
- print "SettingsDialog_base.CleaningLevel_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.CleaningLevel_clicked(int): Not implemented yet")
def pushButton5_clicked(self):
- print "SettingsDialog_base.pushButton5_clicked(): Not implemented yet"
+ print("SettingsDialog_base.pushButton5_clicked(): Not implemented yet")
def DefaultsButton_clicked(self):
- print "SettingsDialog_base.DefaultsButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.DefaultsButton_clicked(): Not implemented yet")
def TabWidget_currentChanged(self,a0):
- print "SettingsDialog_base.TabWidget_currentChanged(QWidget*): Not implemented yet"
+ print("SettingsDialog_base.TabWidget_currentChanged(QWidget*): Not implemented yet")
def pushButton6_clicked(self):
- print "SettingsDialog_base.pushButton6_clicked(): Not implemented yet"
+ print("SettingsDialog_base.pushButton6_clicked(): Not implemented yet")
def EmailTestButton_clicked(self):
- print "SettingsDialog_base.EmailTestButton_clicked(): Not implemented yet"
+ print("SettingsDialog_base.EmailTestButton_clicked(): Not implemented yet")
def autoRefreshCheckBox_clicked(self):
- print "SettingsDialog_base.autoRefreshCheckBox_clicked(): Not implemented yet"
+ print("SettingsDialog_base.autoRefreshCheckBox_clicked(): Not implemented yet")
def refreshScopeButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.refreshScopeButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.refreshScopeButtonGroup_clicked(int): Not implemented yet")
def printButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.printButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.printButtonGroup_clicked(int): Not implemented yet")
def scanButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.scanButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.scanButtonGroup_clicked(int): Not implemented yet")
def faxButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.faxButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.faxButtonGroup_clicked(int): Not implemented yet")
def pcardButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.pcardButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.pcardButtonGroup_clicked(int): Not implemented yet")
def copyButtonGroup_clicked(self,a0):
- print "SettingsDialog_base.copyButtonGroup_clicked(int): Not implemented yet"
+ print("SettingsDialog_base.copyButtonGroup_clicked(int): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("SettingsDialog_base",s,c)
diff -Nru hplip-3.14.6/ui/settingsdialog.py hplip-3.15.2/ui/settingsdialog.py
--- hplip-3.14.6/ui/settingsdialog.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/settingsdialog.py 2015-01-29 12:20:22.000000000 +0000
@@ -22,8 +22,9 @@
from base.g import *
from base.codes import *
from base import utils
+from base.sixext import to_unicode
from qt import *
-from settingsdialog_base import SettingsDialog_base
+from .settingsdialog_base import SettingsDialog_base
class SettingsDialog(SettingsDialog_base):
def __init__(self, parent = None,name = None,modal = 0,fl = 0):
@@ -87,19 +88,19 @@
## self.copyButtonGroup.setButton(1)
def updateData(self):
- self.user_settings.cmd_print = unicode(self.PrintCommand.text())
+ self.user_settings.cmd_print = to_unicode(self.PrintCommand.text())
#self.user_settings.cmd_print_int = (self.printButtonGroup.selectedId() == 0)
- self.user_settings.cmd_scan = unicode(self.ScanCommand.text())
+ self.user_settings.cmd_scan = to_unicode(self.ScanCommand.text())
#self.user_settings.cmd_scan_int = (self.scanButtonGroup.selectedId() == 0)
- self.user_settings.cmd_pcard = unicode(self.AccessPCardCommand.text())
+ self.user_settings.cmd_pcard = to_unicode(self.AccessPCardCommand.text())
#self.user_settings.cmd_pcard_int = (self.pcardButtonGroup.selectedId() == 0)
- self.user_settings.cmd_fax = unicode(self.SendFaxCommand.text())
+ self.user_settings.cmd_fax = to_unicode(self.SendFaxCommand.text())
#self.user_settings.cmd_fax_int = (self.faxButtonGroup.selectedId() == 0)
- self.user_settings.cmd_copy = unicode(self.MakeCopiesCommand.text())
+ self.user_settings.cmd_copy = to_unicode(self.MakeCopiesCommand.text())
#self.user_settings.cmd_copy_int = (self.copyButtonGroup.selectedId() == 0)
## self.user_settings.email_alerts = bool(self.EmailCheckBox.isChecked())
diff -Nru hplip-3.14.6/ui/setupform_base.py hplip-3.15.2/ui/setupform_base.py
--- hplip-3.14.6/ui/setupform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -462,79 +462,79 @@
def connectionTypeButtonGroup_clicked(self,a0):
- print "SetupForm_base.connectionTypeButtonGroup_clicked(int): Not implemented yet"
+ print("SetupForm_base.connectionTypeButtonGroup_clicked(int): Not implemented yet")
def probedDevicesListView_currentChanged(self,a0):
- print "SetupForm_base.probedDevicesListView_currentChanged(QListViewItem*): Not implemented yet"
+ print("SetupForm_base.probedDevicesListView_currentChanged(QListViewItem*): Not implemented yet")
def printerNameLineEdit_textChanged(self,a0):
- print "SetupForm_base.printerNameLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.printerNameLineEdit_textChanged(const QString&): Not implemented yet")
def defaultPrinterNamePushButton_clicked(self):
- print "SetupForm_base.defaultPrinterNamePushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.defaultPrinterNamePushButton_clicked(): Not implemented yet")
def ppdBrowsePushButton_clicked(self):
- print "SetupForm_base.ppdBrowsePushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.ppdBrowsePushButton_clicked(): Not implemented yet")
def ppdFileLineEdit_textChanged(self,a0):
- print "SetupForm_base.ppdFileLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.ppdFileLineEdit_textChanged(const QString&): Not implemented yet")
def ppdListView_currentChanged(self,a0):
- print "SetupForm_base.ppdListView_currentChanged(QListViewItem*): Not implemented yet"
+ print("SetupForm_base.ppdListView_currentChanged(QListViewItem*): Not implemented yet")
def probeUpdatePushButton_clicked(self):
- print "SetupForm_base.probeUpdatePushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.probeUpdatePushButton_clicked(): Not implemented yet")
def searchFiltersPushButton_clicked(self):
- print "SetupForm_base.searchFiltersPushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.searchFiltersPushButton_clicked(): Not implemented yet")
def searchFiltersPushButton2_clicked(self):
- print "SetupForm_base.searchFiltersPushButton2_clicked(): Not implemented yet"
+ print("SetupForm_base.searchFiltersPushButton2_clicked(): Not implemented yet")
def manualFindPushButton_clicked(self):
- print "SetupForm_base.manualFindPushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.manualFindPushButton_clicked(): Not implemented yet")
def printerLocationLineEdit_textChanged(self,a0):
- print "SetupForm_base.printerLocationLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.printerLocationLineEdit_textChanged(const QString&): Not implemented yet")
def printerDescriptionLineEdit_textChanged(self,a0):
- print "SetupForm_base.printerDescriptionLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.printerDescriptionLineEdit_textChanged(const QString&): Not implemented yet")
def faxNameLineEdit_textChanged(self,a0):
- print "SetupForm_base.faxNameLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.faxNameLineEdit_textChanged(const QString&): Not implemented yet")
def faxNumberLineEdit_textChanged(self,a0):
- print "SetupForm_base.faxNumberLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.faxNumberLineEdit_textChanged(const QString&): Not implemented yet")
def faxNameCoLineEdit_textChanged(self,a0):
- print "SetupForm_base.faxNameCoLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.faxNameCoLineEdit_textChanged(const QString&): Not implemented yet")
def printTestPageCheckBox_clicked(self):
- print "SetupForm_base.printTestPageCheckBox_clicked(): Not implemented yet"
+ print("SetupForm_base.printTestPageCheckBox_clicked(): Not implemented yet")
def faxCheckBox_clicked(self):
- print "SetupForm_base.faxCheckBox_clicked(): Not implemented yet"
+ print("SetupForm_base.faxCheckBox_clicked(): Not implemented yet")
def faxCheckBox_toggled(self,a0):
- print "SetupForm_base.faxCheckBox_toggled(bool): Not implemented yet"
+ print("SetupForm_base.faxCheckBox_toggled(bool): Not implemented yet")
def printTestPageCheckBox_toggled(self,a0):
- print "SetupForm_base.printTestPageCheckBox_toggled(bool): Not implemented yet"
+ print("SetupForm_base.printTestPageCheckBox_toggled(bool): Not implemented yet")
def defaultFaxNamePushButton_clicked(self):
- print "SetupForm_base.defaultFaxNamePushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.defaultFaxNamePushButton_clicked(): Not implemented yet")
def otherPPDPushButton_clicked(self):
- print "SetupForm_base.otherPPDPushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.otherPPDPushButton_clicked(): Not implemented yet")
def ppdDefaultsPushButton_clicked(self):
- print "SetupForm_base.ppdDefaultsPushButton_clicked(): Not implemented yet"
+ print("SetupForm_base.ppdDefaultsPushButton_clicked(): Not implemented yet")
def faxLocationLineEdit_textChanged(self,a0):
- print "SetupForm_base.faxLocationLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.faxLocationLineEdit_textChanged(const QString&): Not implemented yet")
def faxDescriptionLineEdit_textChanged(self,a0):
- print "SetupForm_base.faxDescriptionLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupForm_base.faxDescriptionLineEdit_textChanged(const QString&): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("SetupForm_base",s,c)
diff -Nru hplip-3.14.6/ui/setupform.py hplip-3.15.2/ui/setupform.py
--- hplip-3.14.6/ui/setupform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupform.py 2015-01-29 12:20:22.000000000 +0000
@@ -31,8 +31,9 @@
# Local
from base.g import *
from base import device, utils, models, pkit
+from base.sixext import to_unicode
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
from installer import pluginhandler
try:
@@ -46,9 +47,9 @@
# Qt
from qt import *
-from setupform_base import SetupForm_base
-from setupsettings import SetupSettings
-from setupmanualfind import SetupManualFind
+from .setupform_base import SetupForm_base
+from .setupsettings import SetupSettings
+from .setupmanualfind import SetupManualFind
class DeviceListViewItem(QListViewItem):
@@ -69,12 +70,12 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
if not input:
return QValidator.Acceptable, pos
- elif input[pos-1] in u"""~`!@#$%^&*()-=+[]{}()\\/,.<>?'\";:| """:
+ elif input[pos-1] in """~`!@#$%^&*()-=+[]{}()\\/,.<>?'\";:| """:
return QValidator.Invalid, pos
# TODO: How to determine if unicode char is "printable" and acceptable
@@ -92,12 +93,12 @@
QValidator.__init__(self, parent, name)
def validate(self, input, pos):
- input = unicode(input)
+ input = to_unicode(input)
if not input:
return QValidator.Acceptable, pos
- elif input[pos-1] not in u'0123456789-(+) ':
+ elif input[pos-1] not in '0123456789-(+) ':
return QValidator.Invalid, pos
else:
@@ -565,7 +566,7 @@
def otherPPDPushButton_clicked(self):
ppd_dir = sys_conf.get('dirs', 'ppd')
- ppd_file = unicode(QFileDialog.getOpenFileName(ppd_dir, "PPD Files (*.ppd *.ppd.gz);;All Files (*)", self, "open file dialog", "Choose a PPD file"))
+ ppd_file = to_unicode(QFileDialog.getOpenFileName(ppd_dir, "PPD Files (*.ppd *.ppd.gz);;All Files (*)", self, "open file dialog", "Choose a PPD file"))
if ppd_file and os.path.exists(ppd_file):
self.updatePPDPage({ppd_file: cups.getPPDDescription(ppd_file)})
@@ -641,7 +642,7 @@
def printerNameLineEdit_textChanged(self,a0):
- self.printer_name = unicode(a0)
+ self.printer_name = to_unicode(a0)
self.defaultPrinterNamePushButton.setEnabled(True)
self.printer_name_ok = True
@@ -675,16 +676,16 @@
def printerLocationLineEdit_textChanged(self, a0):
- self.location = unicode(a0)
+ self.location = to_unicode(a0)
def printerDescriptionLineEdit_textChanged(self,a0):
- self.desc = unicode(a0)
+ self.desc = to_unicode(a0)
def faxLocationLineEdit_textChanged(self,a0):
- self.fax_location = unicode(a0)
+ self.fax_location = to_unicode(a0)
def faxDescriptionLineEdit_textChanged(self,a0):
- self.fax_desc = unicode(a0)
+ self.fax_desc = to_unicode(a0)
def defaultPrinterNamePushButton_clicked(self):
self.setDefaultPrinterName()
@@ -722,7 +723,7 @@
#self.fax_name_error = False
def faxNameLineEdit_textChanged(self, a0):
- self.fax_name = unicode(a0)
+ self.fax_name = to_unicode(a0)
self.defaultFaxNamePushButton.setEnabled(True)
self.fax_name_ok = True
@@ -756,10 +757,10 @@
def faxNumberLineEdit_textChanged(self, a0):
- self.fax_number = unicode(a0)
+ self.fax_number = to_unicode(a0)
def faxNameCoLineEdit_textChanged(self, a0):
- self.fax_name_company = unicode(a0)
+ self.fax_name_company = to_unicode(a0)
def faxCheckBox_clicked(self):
pass
@@ -788,7 +789,7 @@
d.open()
except Error:
error_text = self.__tr("Unable to communicate with the device. Please check the device and try again.")
- log.error(unicode(error_text))
+ log.error(to_unicode(error_text))
if QMessageBox.critical(self,
self.caption(),
error_text,
@@ -807,15 +808,15 @@
try:
if read:
- self.fax_number = unicode(d.getPhoneNum())
- self.fax_name_company = unicode(d.getStationName())
+ self.fax_number = to_unicode(d.getPhoneNum())
+ self.fax_name_company = to_unicode(d.getStationName())
else:
d.setStationName(self.fax_name_company)
d.setPhoneNum(self.fax_number)
except Error:
error_text = self.__tr("Device I/O Error
Could not communicate with device. Device may be busy.")
- log.error(unicode(error_text))
+ log.error(to_unicode(error_text))
if QMessageBox.critical(self,
self.caption(),
@@ -856,7 +857,7 @@
if self.mq.get('fw-download', False):
try:
d = device.Device(self.device_uri)
- except Error , e:
+ except Error as e:
self.FailureUI(self.__tr("Error opening device. Firmware download is Failed.
%s (%s)." % (e.msg, e.opt)))
else:
if d.downloadFirmware():
@@ -876,9 +877,9 @@
#if self.ppd_file.startswith("foomatic:"):
if not os.path.exists(self.ppd_file): # assume foomatic: or some such
- add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri,self.location, '', self.ppd_file, self.desc)
+ add_prnt_args = (self.printer_name, self.device_uri,self.location, '', self.ppd_file, self.desc)
else:
- add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri, self.location, self.ppd_file, '', self.desc)
+ add_prnt_args = (self.printer_name, self.device_uri, self.location, self.ppd_file, '', self.desc)
status, status_str = cups.cups_operation(cups.addPrinter, GUI_MODE, 'qt3', self, *add_prnt_args)
@@ -894,7 +895,6 @@
QApplication.restoreOverrideCursor()
return status
-
def setupFax(self):
status = cups.IPP_BAD_REQUEST
QApplication.setOverrideCursor(QApplication.waitCursor)
@@ -915,7 +915,7 @@
while True:
ppd_dir = sys_conf.get('dirs', 'ppd')
- fax_ppd = unicode(QFileDialog.getOpenFileName(ppd_dir,
+ fax_ppd = to_unicode(QFileDialog.getOpenFileName(ppd_dir,
"HP Fax PPD Files (*.ppd *.ppd.gz);;All Files (*)", self,
"open file dialog", "Choose the fax PPD file"))
@@ -957,7 +957,7 @@
if self.print_test_page:
try:
d = device.Device(self.device_uri)
- except Error, e:
+ except Error as e:
self.FailureUI(self.__tr("Device error:
%s (%s)." % (e.msg, e.opt)))
else:
@@ -971,7 +971,7 @@
try:
d.printTestPage(self.printer_name)
- except Error, e:
+ except Error as e:
if e.opt == ERROR_NO_CUPS_QUEUE_FOUND_FOR_DEVICE:
self.FailureUI(self.__tr("No CUPS queue found for device.
Please install the printer in CUPS and try again."))
else:
@@ -988,7 +988,7 @@
QWizard.reject(self)
def FailureUI(self, error_text):
- log.error(unicode(error_text).replace("", "").replace("", "").replace("
", " "))
+ log.error(to_unicode(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.critical(self,
self.caption(),
error_text,
@@ -1054,10 +1054,10 @@
self.usernameLineEdit.setPaletteBackgroundColor(QColor("lightgray"))
def getUsername(self):
- return unicode(self.usernameLineEdit.text())
+ return to_unicode(self.usernameLineEdit.text())
def getPassword(self):
- return unicode(self.passwordLineEdit.text())
+ return to_unicode(self.passwordLineEdit.text())
def languageChange(self):
self.setCaption(self.__tr("HP Device Manager - Enter Username/Password"))
diff -Nru hplip-3.14.6/ui/setupmanualfind_base.py hplip-3.15.2/ui/setupmanualfind_base.py
--- hplip-3.14.6/ui/setupmanualfind_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupmanualfind_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -80,7 +80,7 @@
def findLineEdit_textChanged(self,a0):
- print "SetupManualFind_base.findLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupManualFind_base.findLineEdit_textChanged(const QString&): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("SetupManualFind_base",s,c)
diff -Nru hplip-3.14.6/ui/setupmanualfind.py hplip-3.15.2/ui/setupmanualfind.py
--- hplip-3.14.6/ui/setupmanualfind.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupmanualfind.py 2015-01-29 12:20:22.000000000 +0000
@@ -20,9 +20,10 @@
#
from base.g import *
+from base.sixext import to_unicode
from qt import *
-from setupmanualfind_base import SetupManualFind_base
+from .setupmanualfind_base import SetupManualFind_base
class SetupManualFind(SetupManualFind_base):
def __init__(self, bus, parent=None, name=None, modal=0, fl = 0):
@@ -47,7 +48,7 @@
self.findTextLabel.setText(self.__tr("""Device Node:"""))
def findLineEdit_textChanged(self,a0):
- self.param = unicode(a0)
+ self.param = to_unicode(a0)
if self.bus == 'usb':
bus, dev = self.param.split(':')
diff -Nru hplip-3.14.6/ui/setupsettings_base.py hplip-3.15.2/ui/setupsettings_base.py
--- hplip-3.14.6/ui/setupsettings_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupsettings_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -187,31 +187,31 @@
def faxCheckBox_toggled(self,a0):
- print "SetupSettings_base.faxCheckBox_toggled(bool): Not implemented yet"
+ print("SetupSettings_base.faxCheckBox_toggled(bool): Not implemented yet")
def scanCheckBox_toggled(self,a0):
- print "SetupSettings_base.scanCheckBox_toggled(bool): Not implemented yet"
+ print("SetupSettings_base.scanCheckBox_toggled(bool): Not implemented yet")
def pcardCheckBox_toggled(self,a0):
- print "SetupSettings_base.pcardCheckBox_toggled(bool): Not implemented yet"
+ print("SetupSettings_base.pcardCheckBox_toggled(bool): Not implemented yet")
def copyCheckBox_toggled(self,a0):
- print "SetupSettings_base.copyCheckBox_toggled(bool): Not implemented yet"
+ print("SetupSettings_base.copyCheckBox_toggled(bool): Not implemented yet")
def filterButtonGroup_clicked(self,a0):
- print "SetupSettings_base.filterButtonGroup_clicked(int): Not implemented yet"
+ print("SetupSettings_base.filterButtonGroup_clicked(int): Not implemented yet")
def searchTermLineEdit_textChanged(self,a0):
- print "SetupSettings_base.searchTermLineEdit_textChanged(const QString&): Not implemented yet"
+ print("SetupSettings_base.searchTermLineEdit_textChanged(const QString&): Not implemented yet")
def ttlSpinBox_valueChanged(self,a0):
- print "SetupSettings_base.ttlSpinBox_valueChanged(int): Not implemented yet"
+ print("SetupSettings_base.ttlSpinBox_valueChanged(int): Not implemented yet")
def timeoutSpinBox_valueChanged(self,a0):
- print "SetupSettings_base.timeoutSpinBox_valueChanged(int): Not implemented yet"
+ print("SetupSettings_base.timeoutSpinBox_valueChanged(int): Not implemented yet")
def defaultsPushButton_clicked(self):
- print "SetupSettings_base.defaultsPushButton_clicked(): Not implemented yet"
+ print("SetupSettings_base.defaultsPushButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("SetupSettings_base",s,c)
diff -Nru hplip-3.14.6/ui/setupsettings.py hplip-3.15.2/ui/setupsettings.py
--- hplip-3.14.6/ui/setupsettings.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/setupsettings.py 2015-01-29 12:20:22.000000000 +0000
@@ -21,9 +21,10 @@
from base.g import *
from base.codes import *
+from base.sixext import to_unicode
from qt import *
-from setupsettings_base import SetupSettings_base
+from .setupsettings_base import SetupSettings_base
class SetupSettings(SetupSettings_base):
def __init__(self, bus, filter, search, ttl, timeout, parent=None, name=None, modal=0, fl = 0):
@@ -75,7 +76,7 @@
self.updateFilter(a0)
def searchTermLineEdit_textChanged(self, a0):
- self.search = unicode(a0)
+ self.search = to_unicode(a0)
def ttlSpinBox_valueChanged(self, a0):
self.ttl = a0
diff -Nru hplip-3.14.6/ui/systemtray.py hplip-3.15.2/ui/systemtray.py
--- hplip-3.14.6/ui/systemtray.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/systemtray.py 2015-01-29 12:20:22.000000000 +0000
@@ -31,7 +31,7 @@
# Local
from base.g import *
from base import device, utils
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
try:
@@ -280,7 +280,7 @@
if managerWin != 0:
# set StructureNotifyMask (1L << 17)
- XSelectInput(dpy, managerWin, 1L << 17)
+ XSelectInput(dpy, managerWin, 1 << 17)
#XUngrabServer(dpy)
XFlush(dpy)
diff -Nru hplip-3.14.6/ui/unloadform.py hplip-3.15.2/ui/unloadform.py
--- hplip-3.14.6/ui/unloadform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/unloadform.py 2015-01-29 12:20:22.000000000 +0000
@@ -26,12 +26,13 @@
# Local
from base.g import *
from base import utils, device
+from base.sixext import to_unicode
from prnt import cups
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from scrollunload import ScrollUnloadView
+from .scrollunload import ScrollUnloadView
class UnloadForm(QMainWindow):
@@ -77,7 +78,7 @@
max_deviceid_size = max(len(d), max_deviceid_size)
if x == 0:
- from nodevicesform import NoDevicesForm
+ from .nodevicesform import NoDevicesForm
self.FailureUI(self.__tr("
No devices found that support photo card access.
Please make sure your device is properly installed and try again."))
self.init_failed = True
@@ -86,7 +87,7 @@
self.device_uri = devices[0][0]
else:
- from choosedevicedlg import ChooseDeviceDlg
+ from .choosedevicedlg import ChooseDeviceDlg
dlg = ChooseDeviceDlg(devices)
if dlg.exec_loop() == QDialog.Accepted:
self.device_uri = dlg.device_uri
@@ -105,7 +106,7 @@
try:
self.cur_device = device.Device(device_uri=self.device_uri,
printer_name=self.printer_name)
- except Error, e:
+ except Error as e:
log.error("Invalid device URI or printer name.")
self.FailureUI("Invalid device URI or printer name.
Please check the parameters to hp-print and try again.")
self.init_failed = True
@@ -130,7 +131,7 @@
self.UnloadView.onDeviceChange(self.cur_device)
def FailureUI(self, error_text):
- log.error(unicode(error_text).replace("", "").replace("", "").replace("
", " "))
+ log.error(to_unicode(error_text).replace("", "").replace("", "").replace("
", " "))
QMessageBox.critical(self,
self.caption(),
error_text,
diff -Nru hplip-3.14.6/ui/upgradeform.py hplip-3.15.2/ui/upgradeform.py
--- hplip-3.14.6/ui/upgradeform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/upgradeform.py 2015-01-29 12:20:22.000000000 +0000
@@ -28,11 +28,11 @@
# Local
from base.g import *
from base import device, utils, models, os_utils
-from ui_utils import load_pixmap
+from .ui_utils import load_pixmap
# Qt
from qt import *
-from upgradeform_base import UpgradeForm_base
+from .upgradeform_base import UpgradeForm_base
MANUAL_INSTALL_LINK = "http://hplipopensource.com/hplip-web/install/manual/index.html"
@@ -94,7 +94,7 @@
else:
log.debug("HPLIP Upgrade, selected Install radiobutton distro_type=%d" %self.distro_type)
self.NextButton.setEnabled(False)
- if self.distro_type != 1: # not tier 1 distro
+ if self.distro_type != 1: # not tier 1 distro
utils.openURL(MANUAL_INSTALL_LINK)
else:
terminal_cmd = utils.get_terminal()
diff -Nru hplip-3.14.6/ui/waitform_base.py hplip-3.15.2/ui/waitform_base.py
--- hplip-3.14.6/ui/waitform_base.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/waitform_base.py 2015-01-29 12:20:22.000000000 +0000
@@ -57,7 +57,7 @@
def cancelPushButton_clicked(self):
- print "WaitForm_base.cancelPushButton_clicked(): Not implemented yet"
+ print("WaitForm_base.cancelPushButton_clicked(): Not implemented yet")
def __tr(self,s,c = None):
return qApp.translate("WaitForm_base",s,c)
diff -Nru hplip-3.14.6/ui/waitform.py hplip-3.15.2/ui/waitform.py
--- hplip-3.14.6/ui/waitform.py 2014-06-03 06:31:28.000000000 +0000
+++ hplip-3.15.2/ui/waitform.py 2015-01-29 12:20:22.000000000 +0000
@@ -21,7 +21,7 @@
import sys
from qt import *
-from waitform_base import WaitForm_base
+from .waitform_base import WaitForm_base
class WaitForm(WaitForm_base):
def __init__(self, seconds, message=None, cancel_func=None, parent=None, name=None, modal=0, fl=0):
diff -Nru hplip-3.14.6/ui4/aboutdialog.py hplip-3.15.2/ui4/aboutdialog.py
--- hplip-3.14.6/ui4/aboutdialog.py 2014-06-03 06:31:26.000000000 +0000
+++ hplip-3.15.2/ui4/aboutdialog.py 2015-01-29 12:20:15.000000000 +0000
@@ -23,14 +23,14 @@
# Local
from base.g import *
#from base import device, utils
-from ui_utils import *
+from .ui_utils import *
# Qt
from PyQt4.QtCore import *
from PyQt4.QtGui import *
# Ui
-from aboutdialog_base import Ui_AboutDlg_base
+from .aboutdialog_base import Ui_AboutDlg_base
class AboutDialog(QDialog, Ui_AboutDlg_base):
diff -Nru hplip-3.14.6/ui4/aligndialog_base.py hplip-3.15.2/ui4/aligndialog_base.py
--- hplip-3.14.6/ui4/aligndialog_base.py 2014-06-03 06:31:26.000000000 +0000
+++ hplip-3.15.2/ui4/aligndialog_base.py 2015-01-29 12:20:15.000000000 +0000
@@ -372,5 +372,5 @@
"
\n"
"Cartridge alignment on this printer is only available by accessing the front panel of the printer. Please refer to the user guide for the printer for more information. Click Finish to exit.