From 938683932048c6d73ce1446d9c4af99a0e3e9c80 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 20 Mar 2019 21:11:45 +0530 Subject: [PATCH] Various ixes for the previous polyglot commit --- src/calibre/db/delete_service.py | 1 + src/calibre/ebooks/docx/writer/links.py | 2 +- .../oeb/display/test-cfi/run_rapydscript.py | 1 + src/calibre/srv/web_socket.py | 2 ++ src/calibre/utils/html2text_test.py | 12 -------- src/calibre/web/fetch/simple.py | 29 +++++++++++++------ src/polyglot/queue.py | 4 +-- 7 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 src/calibre/utils/html2text_test.py diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py index 6698f4680c..a64349ae43 100644 --- a/src/calibre/db/delete_service.py +++ b/src/calibre/db/delete_service.py @@ -136,6 +136,7 @@ class DeleteService(Thread): finally: shutil.rmtree(tdir) + __ds = None diff --git a/src/calibre/ebooks/docx/writer/links.py b/src/calibre/ebooks/docx/writer/links.py index 4e6315d738..e334abee9b 100644 --- a/src/calibre/ebooks/docx/writer/links.py +++ b/src/calibre/ebooks/docx/writer/links.py @@ -42,7 +42,7 @@ class TOCItem(object): r = makeelement(p, 'w:r') makeelement(r, 'w:fldChar', w_fldCharType='begin') r = makeelement(p, 'w:r') - makeelement(r, 'w:instrText').text = ' TOC \h ' + makeelement(r, 'w:instrText').text = r' TOC \h ' r[0].set('{http://www.w3.org/XML/1998/namespace}space', 'preserve') r = makeelement(p, 'w:r') makeelement(r, 'w:fldChar', w_fldCharType='separate') diff --git a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py index 0ca3698b23..a31da7fbac 100644 --- a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py +++ b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py @@ -36,5 +36,6 @@ def run_devel_server(): except KeyboardInterrupt: pass + if __name__ == '__main__': run_devel_server() diff --git a/src/calibre/srv/web_socket.py b/src/calibre/srv/web_socket.py index de6f72ecdb..5fdf7ab309 100644 --- a/src/calibre/srv/web_socket.py +++ b/src/calibre/srv/web_socket.py @@ -235,6 +235,7 @@ class MessageWriter(object): return ReadOnlyFileBuffer(create_frame(fin, opcode, raw, self.mask)) # }}} + conn_id = 0 @@ -562,6 +563,7 @@ def run_echo_server(): with HandleInterrupt(s.wakeup): s.serve_forever() + if __name__ == '__main__': # import cProfile # cProfile.runctx('r()', {'r':run_echo_server}, {}, filename='stats.profile') diff --git a/src/calibre/utils/html2text_test.py b/src/calibre/utils/html2text_test.py deleted file mode 100644 index 85ff04a803..0000000000 --- a/src/calibre/utils/html2text_test.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python2 -# vim:fileencoding=utf-8 -# License: GPL v3 Copyright: 2019, Kovid Goyal - -from __future__ import absolute_import, division, print_function, unicode_literals - -import unittest - -class Test(unittest.TestCase): - -def find_tests(): - return unittest.defaultTestLoader.loadTestsFromTestCase(Test) diff --git a/src/calibre/web/fetch/simple.py b/src/calibre/web/fetch/simple.py index 3d0a3dc6db..2adcc443f3 100644 --- a/src/calibre/web/fetch/simple.py +++ b/src/calibre/web/fetch/simple.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 -from __future__ import with_statement, print_function +from __future__ import print_function, with_statement + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' @@ -7,25 +8,35 @@ __copyright__ = '2008, Kovid Goyal ' Fetch a webpage and its links recursively. The webpages are saved to disk in UTF-8 encoding with any charset declarations removed. ''' -import sys, socket, os, re, time, threading, traceback -from httplib import responses -from base64 import b64decode -from html5_parser.soup import set_soup_module, parse + +import os +import re +import socket +import sys +import threading +import time +import traceback +from base64 import b64decode +from httplib import responses + +from html5_parser.soup import parse, set_soup_module from calibre import browser, relpath, unicode_path from calibre.constants import filesystem_encoding, iswindows -from calibre.utils.filenames import ascii_filename from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag from calibre.ebooks.chardet import xml_to_unicode from calibre.utils.config import OptionParser -from calibre.utils.logging import Log +from calibre.utils.filenames import ascii_filename from calibre.utils.img import image_from_data, image_to_data from calibre.utils.imghdr import what +from calibre.utils.logging import Log from calibre.web.fetch.utils import rescale_image from polyglot.builtins import unicode_type -from polyglot.urllib import (quote, URLError, url2pathname, urljoin, - urlparse, urlsplit, urlunsplit) +from polyglot.urllib import ( + URLError, quote, url2pathname, urljoin, urlparse, urlsplit, urlunparse, + urlunsplit +) class AbortArticle(Exception): diff --git a/src/polyglot/queue.py b/src/polyglot/queue.py index 17323ed37b..de4cb6fbc5 100644 --- a/src/polyglot/queue.py +++ b/src/polyglot/queue.py @@ -5,6 +5,6 @@ from polyglot.builtins import is_py3 if is_py3: - from queue import * # noqa + from queue import Queue, Empty, Full, PriorityQueue, LifoQueue # noqa else: - from Queue import * # noqa + from Queue import Queue, Empty, Full, PriorityQueue, LifoQueue # noqa