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

py3: misc fixes

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-03 14:40:34 +05:30
parent 69ecc8eb9f
commit 8ece061387
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/utils/mreplace.py
View File

@ -4,6 +4,9 @@ __copyright__ = '2010, sengian <sengian1 @ gmail.com>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import re import re
try:
from collections import UserDict
except ImportError:
from UserDict import UserDict from UserDict import UserDict
@ -18,7 +21,7 @@ class MReplace(UserDict):
def compile_regex(self): def compile_regex(self):
if len(self.data) > 0: if len(self.data) > 0:
keys = sorted(self.data.keys(), key=len, reverse=True) keys = sorted(self.data, key=len, reverse=True)
tmp = "(%s)" % "|".join(map(re.escape, keys)) tmp = "(%s)" % "|".join(map(re.escape, keys))
if self.re != tmp: if self.re != tmp:
self.re = tmp self.re = tmp
@ -35,4 +38,3 @@ class MReplace(UserDict):
if len(self.data) < 1 or self.re is None: if len(self.data) < 1 or self.re is None:
return text return text
return self.regex.sub(self, text) return self.regex.sub(self, text)