py3: more cStringIO

This commit is contained in:
Kovid Goyal 2019-03-30 14:55:32 +05:30
parent dec0a11ec0
commit 496d8beed8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 7 deletions

View File

@ -1,3 +1,4 @@
from __future__ import unicode_literals
char_set = """ char_set = """
<ms_standard> <ms_standard>
NON-BREAKING HYPEHN:_:8290:&#x2011; NON-BREAKING HYPEHN:_:8290:&#x2011;
@ -108,7 +109,7 @@ DIGIT SIX:'36:54:6
DIGIT SEVEN:'37:55:7 DIGIT SEVEN:'37:55:7
DIGIT EIGHT:'38:56:8 DIGIT EIGHT:'38:56:8
DIGIT NINE:'39:57:9 DIGIT NINE:'39:57:9
COLON:'3A:58:\colon COLON:'3A:58:\\colon
SEMICOLON:'3B:59:; SEMICOLON:'3B:59:;
LESS-THAN SIGN:'3C:60:&lt; LESS-THAN SIGN:'3C:60:&lt;
EQUALS SIGN:'3D:61:= EQUALS SIGN:'3D:61:=
@ -15335,7 +15336,7 @@ DIGIT SIX:6:54:\'36
DIGIT SEVEN:7:55:\'37 DIGIT SEVEN:7:55:\'37
DIGIT EIGHT:8:56:\'38 DIGIT EIGHT:8:56:\'38
DIGIT NINE:9:57:\'39 DIGIT NINE:9:57:\'39
COLON:\colon:58:\'3A COLON:\\colon:58:\'3A
SEMICOLON:;:59:\'3B SEMICOLON:;:59:\'3B
EQUALS SIGN:=:61:\'3D EQUALS SIGN:=:61:\'3D
QUESTION MARK:?:63:\'3F QUESTION MARK:?:63:\'3F
@ -15366,7 +15367,7 @@ LATIN CAPITAL LETTER X:X:88:\'58
LATIN CAPITAL LETTER Y:Y:89:\'59 LATIN CAPITAL LETTER Y:Y:89:\'59
LATIN CAPITAL LETTER Z:Z:90:\'5A LATIN CAPITAL LETTER Z:Z:90:\'5A
LEFT SQUARE BRACKET:[:91:\'5B LEFT SQUARE BRACKET:[:91:\'5B
REVERSE SOLIDUS:\:92:\'5C REVERSE SOLIDUS:\\:92:\'5C
RIGHT SQUARE BRACKET:]:93:\'5D RIGHT SQUARE BRACKET:]:93:\'5D
LATIN SMALL LETTER A:a:97:\'61 LATIN SMALL LETTER A:a:97:\'61
LATIN SMALL LETTER B:b:98:\'62 LATIN SMALL LETTER B:b:98:\'62
@ -16175,7 +16176,7 @@ MY OPEN MAILBOX:.:0:<open_mailbox/>
WRITING HAND:?:9996:&#x270C; WRITING HAND:?:9996:&#x270C;
EIGHT PETALLED OUTLINED BLACK FLORETTE:|:10049:&#x2741; EIGHT PETALLED OUTLINED BLACK FLORETTE:|:10049:&#x2741;
MY OPEN MAILBOX:/:0:<open_mailbox/> MY OPEN MAILBOX:/:0:<open_mailbox/>
MY COMPUETR:\colon:0:<computer/> MY COMPUETR:\\colon:0:<computer/>
MY DOWNWARD LEAF:" :0:<downward_leaf/> MY DOWNWARD LEAF:" :0:<downward_leaf/>
MY UPWARD LEAF:" :0:<upward_leaf/> MY UPWARD LEAF:" :0:<upward_leaf/>
</wingdings_old> </wingdings_old>
@ -16681,7 +16682,7 @@ TELEPHONE LOCATION SIGN:&:9990:&#x2706;
BLACK RIGHT POINTING INDEX:*:9755:&#x261B; BLACK RIGHT POINTING INDEX:*:9755:&#x261B;
AIRPLANE:(:9992:&#x2708; AIRPLANE:(:9992:&#x2708;
ENVELOPE:):9993:&#x2709; ENVELOPE:):9993:&#x2709;
HEAVY GREK CROSS:\colon:10010:&#x271A; HEAVY GREK CROSS:\\colon:10010:&#x271A;
OUTLINED LATIN CROSS:?:10015:&#x271F; OUTLINED LATIN CROSS:?:10015:&#x271F;
PENCIL:/:9999:&#x270F; PENCIL:/:9999:&#x270F;
OPEN CENTRE TEARDROP-SPOKED ASTERISK:\\:10044:&#x273C; OPEN CENTRE TEARDROP-SPOKED ASTERISK:\\:10044:&#x273C;

View File

@ -10,7 +10,7 @@
# # # #
# # # #
######################################################################### #########################################################################
import sys, os, cStringIO import sys, os, io
from calibre.ebooks.rtf2xml import get_char_map, copy from calibre.ebooks.rtf2xml import get_char_map, copy
from calibre.ebooks.rtf2xml.char_set import char_set from calibre.ebooks.rtf2xml.char_set import char_set
@ -148,7 +148,7 @@ class Hex2Utf8:
# 128, and the encoding system for Microsoft characters. # 128, and the encoding system for Microsoft characters.
# New on 2004-05-8: the self.__char_map is not in directory with other # New on 2004-05-8: the self.__char_map is not in directory with other
# modules # modules
self.__char_file = cStringIO.StringIO(char_set) self.__char_file = io.StringIO(char_set)
char_map_obj = get_char_map.GetCharMap( char_map_obj = get_char_map.GetCharMap(
char_file=self.__char_file, char_file=self.__char_file,
bug_handler=self.__bug_handler, bug_handler=self.__bug_handler,