Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

A couple of fixes for the last py3 compat PR

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-10 17:30:38 +05:30
parent c897bc1a5d
commit 28145e76b0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/mtp/unix/driver.py
View File

@ -12,8 +12,8 @@ from threading import RLock
from collections import namedtuple
from functools import partial
from calibre import prints, as_unicode
from calibre.constants import plugins, islinux, isosx
from calibre import prints, as_unicode, force_unicode
from calibre.constants import plugins, islinux, isosx, ispy3
from calibre.ptempfile import SpooledTemporaryFile
from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice, OpenActionNeeded
from calibre.devices.mtp.base import MTPDeviceBase, synchronous, debug
@ -166,8 +166,12 @@ class MTP_DEVICE(MTPDeviceBase):
@synchronous
def create_device(self, connected_device):
d = connected_device
man, prod = d.manufacturer, d.prod
if ispy3:
man = force_unicode(man, 'utf-8') if isinstance(man, bytes) else man
prod = force_unicode(prod, 'utf-8') if isinstance(prod, bytes) else prod
return self.libmtp.Device(d.busnum, d.devnum, d.vendor_id,
d.product_id, d.manufacturer, d.product, d.serial)
d.product_id, man, prod, d.serial)
@synchronous
def eject(self):

2
src/calibre/utils/podofo/doc.cpp
View File

@ -83,7 +83,7 @@ static PyObject *
PDFDoc_save(PDFDoc *self, PyObject *args) {
char *buffer;
if (PyArg_ParseTuple(args, BYTES_FMT, &buffer)) {
if (PyArg_ParseTuple(args, "s", &buffer)) {
try {
self->doc->Write(buffer);
} catch(const PdfError & err) {