Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Disambiguate str()

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-29 20:39:43 +05:30
parent 6bd02c1aae
commit a0afe775ba
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/docx/writer/images.py
View File

@ -10,7 +10,7 @@ import os
import posixpath import posixpath
from collections import namedtuple from collections import namedtuple
from functools import partial from functools import partial
from polyglot.builtins import iteritems, itervalues, map from polyglot.builtins import iteritems, itervalues, map, unicode_type
from lxml import etree from lxml import etree
@ -35,7 +35,7 @@ def get_image_margins(style):
ans = {} ans = {}
for edge in 'Left Right Top Bottom'.split(): for edge in 'Left Right Top Bottom'.split():
val = as_num(getattr(style, 'padding' + edge)) + as_num(getattr(style, 'margin' + edge)) val = as_num(getattr(style, 'padding' + edge)) + as_num(getattr(style, 'margin' + edge))
ans['dist' + edge[0]] = str(pt_to_emu(val)) ans['dist' + edge[0]] = unicode_type(pt_to_emu(val))
return ans return ans
@ -127,7 +127,7 @@ class ImagesManager(object):
makeelement(parent, 'wp:simplePos', x='0', y='0') makeelement(parent, 'wp:simplePos', x='0', y='0')
makeelement(makeelement(parent, 'wp:positionH', relativeFrom='margin'), 'wp:align').text = floating makeelement(makeelement(parent, 'wp:positionH', relativeFrom='margin'), 'wp:align').text = floating
makeelement(makeelement(parent, 'wp:positionV', relativeFrom='line'), 'wp:align').text = 'top' makeelement(makeelement(parent, 'wp:positionV', relativeFrom='line'), 'wp:align').text = 'top'
makeelement(parent, 'wp:extent', cx=str(width), cy=str(height)) makeelement(parent, 'wp:extent', cx=unicode_type(width), cy=unicode_type(height))
if fake_margins: if fake_margins:
# DOCX does not support setting margins for inline images, so we # DOCX does not support setting margins for inline images, so we
# fake it by using effect extents to simulate margins # fake it by using effect extents to simulate margins
@ -145,7 +145,7 @@ class ImagesManager(object):
def create_docx_image_markup(self, parent, name, alt, img_rid, width, height): def create_docx_image_markup(self, parent, name, alt, img_rid, width, height):
makeelement, namespaces = self.document_relationships.namespace.makeelement, self.document_relationships.namespace.namespaces makeelement, namespaces = self.document_relationships.namespace.makeelement, self.document_relationships.namespace.namespaces
makeelement(parent, 'wp:docPr', id=str(self.count), name=name, descr=alt) makeelement(parent, 'wp:docPr', id=unicode_type(self.count), name=name, descr=alt)
makeelement(makeelement(parent, 'wp:cNvGraphicFramePr'), 'a:graphicFrameLocks', noChangeAspect="1") makeelement(makeelement(parent, 'wp:cNvGraphicFramePr'), 'a:graphicFrameLocks', noChangeAspect="1")
g = makeelement(parent, 'a:graphic') g = makeelement(parent, 'a:graphic')
gd = makeelement(g, 'a:graphicData', uri=namespaces['pic']) gd = makeelement(g, 'a:graphicData', uri=namespaces['pic'])
@ -158,7 +158,7 @@ class ImagesManager(object):
makeelement(makeelement(bf, 'a:stretch'), 'a:fillRect') makeelement(makeelement(bf, 'a:stretch'), 'a:fillRect')
spPr = makeelement(pic, 'pic:spPr') spPr = makeelement(pic, 'pic:spPr')
xfrm = makeelement(spPr, 'a:xfrm') xfrm = makeelement(spPr, 'a:xfrm')
makeelement(xfrm, 'a:off', x='0', y='0'), makeelement(xfrm, 'a:ext', cx=str(width), cy=str(height)) makeelement(xfrm, 'a:off', x='0', y='0'), makeelement(xfrm, 'a:ext', cx=unicode_type(width), cy=unicode_type(height))
makeelement(makeelement(spPr, 'a:prstGeom', prst='rect'), 'a:avLst') makeelement(makeelement(spPr, 'a:prstGeom', prst='rect'), 'a:avLst')
def create_filename(self, href, fmt): def create_filename(self, href, fmt):
@ -169,7 +169,7 @@ class ImagesManager(object):
base = fname base = fname
while fname.lower() in self.seen_filenames: while fname.lower() in self.seen_filenames:
num += 1 num += 1
fname = base + str(num) fname = base + unicode_type(num)
self.seen_filenames.add(fname.lower()) self.seen_filenames.add(fname.lower())
fname += os.extsep + fmt.lower() fname += os.extsep + fmt.lower()
return fname return fname
@ -204,7 +204,7 @@ class ImagesManager(object):
makeelement(makeelement(parent, 'wp:positionH', relativeFrom='page'), 'wp:align').text = 'center' makeelement(makeelement(parent, 'wp:positionH', relativeFrom='page'), 'wp:align').text = 'center'
makeelement(makeelement(parent, 'wp:positionV', relativeFrom='page'), 'wp:align').text = 'center' makeelement(makeelement(parent, 'wp:positionV', relativeFrom='page'), 'wp:align').text = 'center'
width, height = map(pt_to_emu, (width, height)) width, height = map(pt_to_emu, (width, height))
makeelement(parent, 'wp:extent', cx=str(width), cy=str(height)) makeelement(parent, 'wp:extent', cx=unicode_type(width), cy=unicode_type(height))
makeelement(parent, 'wp:effectExtent', l='0', r='0', t='0', b='0') makeelement(parent, 'wp:effectExtent', l='0', r='0', t='0', b='0')
makeelement(parent, 'wp:wrapTopAndBottom') makeelement(parent, 'wp:wrapTopAndBottom')
self.create_docx_image_markup(parent, 'cover.jpg', _('Cover'), img.rid, width, height) self.create_docx_image_markup(parent, 'cover.jpg', _('Cover'), img.rid, width, height)