1594602 - Fix typos in QMessageBox constructor calls

.gitignore

@@ -88,3 +88,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.18.3.tar.gz
 /hplip-3.18.4.tar.gz
 /hplip-3.18.5.tar.gz
+/hplip-3.18.6.tar.gz

hplip-3.18.5.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlsGQVgACgkQc9dwzaWQR7mUjACeOwZ9fTlMmyQN9U0NQVKsTrGS
-lWEAmwYFt40RC2aKXYWfX39sAm4vtaF2
-=wCpt
------END PGP SIGNATURE-----

hplip-3.18.6.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlsYzCYACgkQc9dwzaWQR7k3kQCgpUG6Okb3nGf7qodmI9zTBf3A
+a8AAoLD0LiwifYlnEBlHS5Eaw/ylB9A8
+=H/1x
+-----END PGP SIGNATURE-----

hplip-error-print.patch

@@ -0,0 +1,78 @@
+commit 4c913b68d8f8a79e11e247a8f7086f779f2685d4
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Tue Sep 18 16:17:06 2018 +0200
+
+    Fix TypeError
+    
+    - 1564770 - TypeError: 'Error' object does not support indexing
+
+diff --git a/clean.py b/clean.py
+index 3d41f04..3a7248e 100755
+--- a/clean.py
++++ b/clean.py
+@@ -182,7 +182,7 @@ try:
+                         log.error("Cleaning not needed or supported on this device.")
+ 
+                 except Error as e:
+-                    log.error("An error occured: %s" % e[0])
++                    log.error("An error occured: %s" % e.msg)
+ 
+             else:
+                 log.error("Device is busy or in an error state. Please check device and try again.")
+diff --git a/ui/scrollunload.py b/ui/scrollunload.py
+index fdb48e8..345ed82 100644
+--- a/ui/scrollunload.py
++++ b/ui/scrollunload.py
+@@ -120,7 +120,7 @@ class ScrollUnloadView(ScrollView):
+                 self.pc = photocard.PhotoCard(None, self.cur_device.device_uri, self.cur_printer)
+             except Error as e:
+                 QApplication.restoreOverrideCursor()
+-                self.form.FailureUI(self.__tr("An error occured: %s" % e[0]))
++                self.form.FailureUI(self.__tr("An error occured: %s" % e.msg))
+                 self.cleanup(EVENT_PCARD_UNABLE_TO_MOUNT)
+                 return False
+ 
+diff --git a/ui4/wifisetupdialog.py b/ui4/wifisetupdialog.py
+index 9fd1786..4d36f83 100644
+--- a/ui4/wifisetupdialog.py
++++ b/ui4/wifisetupdialog.py
+@@ -256,7 +256,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:
+                 self.dev = device.Device(self.device_uri)
+             except Error as e:
+-                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, QString(e[0])))
++                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, QString(e.msg)))
+ 
+                 if self.dev is not None:
+                     self.dev.close()
+@@ -834,7 +834,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+ 
+ 
+     def showIOError(self, e):
+-        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % QString(e[0])))
++        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % QString(e.msg)))
+ 
+         if self.dev is not None:
+             self.dev.close()
+diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py
+index e0c7aee..74cc0ef 100644
+--- a/ui5/wifisetupdialog.py
++++ b/ui5/wifisetupdialog.py
+@@ -259,7 +259,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:
+                 self.dev = device.Device(self.device_uri)
+             except Error as e:
+-                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, str(e[0])))
++                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, str(e.msg)))
+ 
+                 if self.dev is not None:
+                     self.dev.close()
+@@ -840,7 +840,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+ 
+ 
+     def showIOError(self, e):
+-        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % str(e[0])))
++        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % str(e.msg)))
+ 
+         if self.dev is not None:
+             self.dev.close()

hplip-hpfax-importerror-print.patch

@@ -0,0 +1,19 @@
+commit cdf5cb36e5d5a86f6a690c5861666cdc2da70593
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Wed Sep 19 15:33:03 2018 +0200
+
+    Fix TypeError in hpfax
+
+diff --git a/fax/backend/hpfax.py b/fax/backend/hpfax.py
+index 9560e84..bc0912a 100755
+--- a/fax/backend/hpfax.py
++++ b/fax/backend/hpfax.py
+@@ -89,7 +89,7 @@ try:
+     from base import utils
+     from prnt import cups
+ except ImportError as e:
+-    bug("Error importing HPLIP modules: %s\n" % (pid, e))
++    bug("Error importing HPLIP modules: %s\n" % (e))
+     sys.exit(1)
+ 
+ def handle_sigpipe():

hplip-qmsgbox-typos.patch

@@ -0,0 +1,68 @@
+commit 7623eb3c83d91405471177d750ab0ae8fd05a0d6
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Mon Oct 1 16:27:36 2018 +0200
+
+    Fix typos in QMessageBox constructors
+
+diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
+index 35bdcb7..267cfba 100644
+--- a/ui5/devmgr5.py
++++ b/ui5/devmgr5.py
+@@ -139,8 +139,7 @@ class PluginInstall(QObject):
+             install_plugin = QMessageBox.warning(self.parent,
+                                 self.parent.windowTitle(),
+                                 self.__tr("<b>The HPLIP plugin is already installed.</b><p>Do you want to continue and re-install it?"),
+-                                QMessageBox.Yes,
+-                                QMessageBox.No,
++                                QMessageBox.Yes | QMessageBox.No,
+                                 QMessageBox.NoButton) == QMessageBox.Yes
+ 
+         if install_plugin:
+@@ -149,8 +148,7 @@ class PluginInstall(QObject):
+                 QMessageBox.critical(self.parent,
+                     self.parent.windowTitle(),
+                     self.__tr("<b>Unable to find an appropriate su/sudo utility to run hp-plugin.</b><p>Install kdesu, gnomesu, or gksu.</p>"),
+-                    QMessageBox.Ok,
+-                    QMessageBox.NoButton,
++                    QMessageBox.Ok | QMessageBox.NoButton,
+                     QMessageBox.NoButton)
+ 
+ 
+diff --git a/ui5/nodevicesdialog.py b/ui5/nodevicesdialog.py
+index 6083f6d..ca86bfc 100644
+--- a/ui5/nodevicesdialog.py
++++ b/ui5/nodevicesdialog.py
+@@ -64,8 +64,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base):
+             QMessageBox.critical(self,
+                                     self.windowTitle(),
+                                     self.__tr("<b>An error occurred.</b><p>Please re-start the Device Manager and try again."),
+-                                    QMessageBox.Ok,
+-                                    QMessageBox.NoButton,
++                                    QMessageBox.Ok | QMessageBox.NoButton,
+                                     QMessageBox.NoButton)
+ 
+ 
+diff --git a/ui5/setupdialog.py b/ui5/setupdialog.py
+index fbfe5ac..05e2b1d 100644
+--- a/ui5/setupdialog.py
++++ b/ui5/setupdialog.py
+@@ -1108,8 +1108,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                     if QMessageBox.critical(self,
+                                            self.windowTitle(),
+                                            error_text,
+-                                           QMessageBox.Retry | QMessageBox.Default,
+-                                           QMessageBox.Cancel | QMessageBox.Escape,
++                                           QMessageBox.Retry | QMessageBox.Default | QMessageBox.Cancel | QMessageBox.Escape,
+                                            QMessageBox.NoButton) == QMessageBox.Cancel:
+                         break
+ 
+@@ -1138,8 +1137,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                                 if QMessageBox.critical(self,
+                                                        self.windowTitle(),
+                                                        error_text,
+-                                                       QMessageBox.Retry | QMessageBox.Default,
+-                                                       QMessageBox.Cancel | QMessageBox.Escape,
++                                                       QMessageBox.Retry | QMessageBox.Default | QMessageBox.Cancel | QMessageBox.Escape,
+                                                        QMessageBox.NoButton) == QMessageBox.Cancel:
+                                     break
+ 

hplip-use-binary-str.patch

@@ -0,0 +1,40 @@
+diff -up hplip-3.18.5/base/utils.py.use-binary-str hplip-3.18.5/base/utils.py
+--- hplip-3.18.5/base/utils.py.use-binary-str	2018-05-28 13:52:32.698082273 +0200
++++ hplip-3.18.5/base/utils.py	2018-05-28 13:53:20.563707314 +0200
+@@ -961,10 +961,7 @@ else:
+ 
+ 
+ def printable(s):
+-    if s:
+-        return s.translate(identity, unprintable)
+-    else:
+-        return ""
++    return s.translate(identity, unprintable)
+ 
+ 
+ def any(S,f=lambda x:x):
+diff -up hplip-3.18.5/fax/pmlfax.py.use-binary-str hplip-3.18.5/fax/pmlfax.py
+--- hplip-3.18.5/fax/pmlfax.py.use-binary-str	2018-05-24 06:34:40.000000000 +0200
++++ hplip-3.18.5/fax/pmlfax.py	2018-05-28 13:52:05.752293151 +0200
+@@ -143,8 +143,8 @@ class PMLFaxDevice(FaxDevice):
+ 
+     def getPhoneNum(self):
+         if PY3:
+-            data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
+-            return data
++            data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1].encode('utf-8'))
++            return data.decode('utf-8')
+         else:
+             return utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
+     phone_num = property(getPhoneNum, setPhoneNum, doc="OID_FAX_LOCAL_PHONE_NUM")
+@@ -155,8 +155,8 @@ class PMLFaxDevice(FaxDevice):
+ 
+     def getStationName(self):
+         if PY3:
+-            data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
+-            return data
++            data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1].encode('utf-8'))
++            return data.decode('utf-8')
+         else:
+             return utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
+ 

hplip-wifisetup.patch

@@ -0,0 +1,19 @@
+commit 7cdc26da185db2335f1efdc6716804266caa1712
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Thu Sep 20 15:04:47 2018 +0200
+
+    Fix wifi printer setup
+
+diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py
+index 74cc0ef..8daff7d 100644
+--- a/ui5/wifisetupdialog.py
++++ b/ui5/wifisetupdialog.py
+@@ -570,7 +570,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:                
+                 self.ip,_,addressmode, subnetmask, gateway, pridns, sec_dns= self.wifiObj.getIPConfiguration(self.dev, self.adapterName)
+                 if self.ip == "0.0.0.0":
+-                    self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiobj.getwifiotherdetails(self.dev,self.adapterName)
++                    self.ip, subnetmask, gateway, pridns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName)
+                 vsa_codes = self.wifiObj.getVSACodes(self.dev, self.adapterName)
+                 ss_max, ss_min, ss_val, ss_dbm = self.wifiObj.getSignalStrength(self.dev, self.adapterName,self.network, self.adaptor_id)                 
+                 self.hn = self.wifiObj.getHostname(self.dev) 

hplip.spec

@@ -6,8 +6,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.18.5
-Release: 1%{?dist}
+Version: 3.18.6
+Release: 5%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -42,6 +42,17 @@ Patch25: hplip-noernie.patch
 Patch26: hplip-appdata.patch
 Patch27: hplip-check-cups.patch
 Patch30: hplip-typo.patch
+# python3 - recent HP release removed encoding/decoding to utf-8 in fax/pmlfax.py -
+# that results in text string going into translate function in base/utils.py, which
+# expects binary string because of parameters. Remove this patch if base/utils.py
+# code gets fixed.
+Patch31: hplip-use-binary-str.patch
+# m278-m281 doesn't work correctly again
+Patch32: hplip-colorlaserjet-mfp-m278-m281.patch
+Patch33: hplip-error-print.patch
+Patch34: hplip-hpfax-importerror-print.patch
+Patch35: hplip-wifisetup.patch
+Patch36: hplip-qmsgbox-typos.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -242,6 +253,31 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 # hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
 %patch30 -p1 -b .typo
 
+%patch31 -p1 -b .use-binary-str
+%patch32 -p1 -b .colorlaserjet-mfp-m278-m281
+
+# TypeError: 'Error' object does not support indexing (bug #1564770)
+# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
+# in python2 it was possible to acces Exception message by index [0].
+# in python3 this is no longer possible and it causes TypeError.
+%patch33 -p1 -b .error-print-fix
+
+# TypeError: not all arguments converted during string formatting (bug #1566938)
+# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
+# bug caused by more arguments than argument specifiers in formatted string
+%patch34 -p1 -b .hpfax-import-error-print
+
+# 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
+# upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
+# bug caused by typo in wifisetupdialog wifiObj property call
+%patch35 -p1 -b .wifisetup-bad-call-fix
+
+# TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
+# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
+# bug caused by typo in QMessageBox constructor call
+# this patch fixes more of those typos
+%patch36 -p1 -b .qmsgbox-typos-fix
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -376,6 +412,19 @@ rm -f %{buildroot}%{_unitdir}/hplip-printer@.service
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# hp-setup needs to have cups service enabled and running for setups of queues
+%pre
+%{_bindir}/systemctl start cups &>/dev/null ||:
+%{_bindir}/systemctl enable cups &>/dev/null ||:
+
+%post
+%{_bindir}/hpcups-update-ppds &>/dev/null ||:
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %doc COPYING doc/*
 # ex-hpijs
@@ -513,14 +562,26 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_libdir}/sane/libsane-*.so.1.0.0
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
-%post
-%{_bindir}/hpcups-update-ppds &>/dev/null ||:
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %changelog
+* Tue Oct 09 2018 Tomas Korbar <tkorbar@redhat.com> - 3.18.6-5
+- 1594602 - Fix typos in QMessageBox constructor calls
+
+* Tue Oct 09 2018 Tomas Korbar <tkorbar@redhat.com> - 3.18.6-4
+- 1626877 - Fix AttributeError when connecting to printer via wifi
+
+* Tue Sep 25 2018 Tomas Korbar <tkorbar@redhat.com> - 3.18.6-3
+- 1566938 - Fix TypeError when printing ImportError message in hpfax
+
+* Tue Sep 25 2018 Tomas Korbar <tkorbar@redhat.com> - 3.18.6-2
+- 1564770 - Fix TypeError when printing error object message 
+
+* Mon Jun 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.6-1
+- 3.18.6, have cups running because hp tools
+
+* Fri May 25 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.5-2
+- hp-setup fails on fax setup - use binary strings 
+- m278-m281 doesn;t work correctly again
+
 * Thu May 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.5-1
 - 3.18.5
 

sources

@@ -1 +1 @@
-SHA512 (hplip-3.18.5.tar.gz) = 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
+SHA512 (hplip-3.18.6.tar.gz) = deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f