rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).

Browse Source
This commit is contained in:
Jiri Popelka 2010-10-24 20:32:39 +02:00
parent 39b6ecf5b3
commit 86d8fc7d0c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hplip-UnicodeDecodeError.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError hplip-3.10.9/ui4/printsettingstoolbox.py
--- hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError 2010-09-26 19:07:19.000000000 +0200
+++ hplip-3.10.9/ui4/printsettingstoolbox.py 2010-10-22 15:01:13.000000000 +0200
@@ -459,7 +459,7 @@ class PrintSettingsToolbox(QToolBox):
self.beginControlGroup(g, QString(text))
- log.debug(" Text: %s" % unicode(text))
+ log.debug(" Text: %s" % repr(text))
log.debug("Num subgroups: %d" % num_subgroups)
options = cups.getOptionList(g)

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.10.9 Version: 3.10.9
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -39,6 +39,7 @@ Patch22: hplip-ppd-ImageableArea.patch
Patch23: hplip-network-timeout.patch Patch23: hplip-network-timeout.patch
Patch24: hplip-addgroup.patch Patch24: hplip-addgroup.patch
Patch25: hplip-raw_deviceID-traceback.patch Patch25: hplip-raw_deviceID-traceback.patch
Patch26: hplip-UnicodeDecodeError.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -242,6 +243,9 @@ done
# Fixed traceback on error condition in device.py (bug #628125). # Fixed traceback on error condition in device.py (bug #628125).
%patch25 -p1 -b .raw_deviceID-traceback %patch25 -p1 -b .raw_deviceID-traceback
# Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).
%patch26 -p1 -b .UnicodeDecodeError
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -468,6 +472,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Sun Oct 24 2010 Jiri Popelka <jpopelka@redhat.com>
- Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).
* Mon Oct 18 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-3 * Mon Oct 18 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-3
- Fixed traceback on error condition in device.py (bug #628125). - Fixed traceback on error condition in device.py (bug #628125).
- Fixed bogus low ink warnings from hpijs driver (bug #643643). - Fixed bogus low ink warnings from hpijs driver (bug #643643).