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

py3: use unicode_literals string type in dynamically updated code

Browse Source
This commit is contained in:
Eli Schwartz 2019-06-26 14:32:27 -04:00
parent 6ca1739d6b
commit 436f864371
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/metadata/sources/overdrive.py
View File

@ -235,7 +235,7 @@ class OverDrive(Source):
xreq.add_header('Referer', q_init_search) xreq.add_header('Referer', q_init_search)
xreq.add_header('Accept', 'application/json, text/javascript, */*') xreq.add_header('Accept', 'application/json, text/javascript, */*')
raw = br.open_novisit(xreq).read() raw = br.open_novisit(xreq).read()
for m in re.finditer(type(u'')(r'"iTotalDisplayRecords":(?P<displayrecords>\d+).*?"iTotalRecords":(?P<totalrecords>\d+)'), raw): for m in re.finditer(type('')(r'"iTotalDisplayRecords":(?P<displayrecords>\d+).*?"iTotalRecords":(?P<totalrecords>\d+)'), raw):
if int(m.group('totalrecords')) == 0: if int(m.group('totalrecords')) == 0:
return '' return ''
elif int(m.group('displayrecords')) >= 1: elif int(m.group('displayrecords')) >= 1:
@ -258,7 +258,7 @@ class OverDrive(Source):
close_matches = [] close_matches = []
raw = re.sub(r'.*?\[\[(?P<content>.*?)\]\].*', r'[[\g<content>]]', raw) raw = re.sub(r'.*?\[\[(?P<content>.*?)\]\].*', r'[[\g<content>]]', raw)
results = json.loads(raw) results = json.loads(raw)
# log.error('raw results are:'+str(results)) # log.error('raw results are:'+type('')(results))
# The search results are either from a keyword search or a multi-format list from a single ID, # The search results are either from a keyword search or a multi-format list from a single ID,
# sort through the results for closest match/format # sort through the results for closest match/format
if results: if results:
@ -336,7 +336,7 @@ class OverDrive(Source):
req.add_header('Referer', search_url) req.add_header('Referer', search_url)
req.add_header('Accept', 'application/json, text/javascript, */*') req.add_header('Accept', 'application/json, text/javascript, */*')
raw = br.open_novisit(req) raw = br.open_novisit(req)
raw = str(list(raw)) raw = type('')(list(raw))
clean_cj = mechanize.CookieJar() clean_cj = mechanize.CookieJar()
br.set_cookiejar(clean_cj) br.set_cookiejar(clean_cj)
return self.sort_ovrdrv_results(raw, log, None, None, None, ovrdrv_id) return self.sort_ovrdrv_results(raw, log, None, None, None, ovrdrv_id)
@ -443,7 +443,7 @@ class OverDrive(Source):
mi.language = lang mi.language = lang
if ebook_isbn: if ebook_isbn:
# print "ebook isbn is "+str(ebook_isbn[0]) # print("ebook isbn is "+type('')(ebook_isbn[0]))
isbn = check_isbn(ebook_isbn[0].strip()) isbn = check_isbn(ebook_isbn[0].strip())
if isbn: if isbn:
self.cache_isbn_to_identifier(isbn, ovrdrv_id) self.cache_isbn_to_identifier(isbn, ovrdrv_id)