26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
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-25 09:33:11.839375105 +0200
|
|
+++ hplip-3.18.5/fax/pmlfax.py 2018-05-25 09:50:54.131762944 +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])
|
|
|