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