Conversion: Convert entities that reference non-BMP unicode codepoints on Windows and OS X correctly. Linux was not affected by this bug. Fixes #1417327 [incorrect assignment code of symbol](https://bugs.launchpad.net/calibre/+bug/1417327)

This commit is contained in:
Kovid Goyal 2015-02-03 12:44:59 +05:30
parent 4618304369
commit 29f4e41fba

View File

@ -19,6 +19,7 @@ from calibre.constants import (iswindows, isosx, islinux, isfrozen,
win32event, win32api, winerror, fcntl,
filesystem_encoding, plugins, config_dir)
from calibre.startup import winutil, winutilerror
from calibre.utils.icu import safe_chr
if False and islinux and not getattr(sys, 'frozen', False):
# Imported before PyQt to workaround PyQt util-linux conflict discovered on gentoo
@ -533,7 +534,7 @@ def strftime(fmt, t=None):
def my_unichr(num):
try:
return unichr(num)
return safe_chr(num)
except (ValueError, OverflowError):
return u'?'