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

Delay load calibre.library.server so that tests dont fail until it is ported

Browse Source
This commit is contained in:
Kovid Goyal 2017-04-07 09:58:37 +05:30
parent 5ed88a0bf5
commit d97e1ce707
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/smart_device_app/driver.py
View File

@ -31,7 +31,6 @@ from calibre.ebooks.metadata import title_sort
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
from calibre.ebooks.metadata.book.json_codec import JsonCodec from calibre.ebooks.metadata.book.json_codec import JsonCodec
from calibre.library import current_library_name from calibre.library import current_library_name
from calibre.library.server import server_config as content_server_config
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.ipc import eintr_retry_call from calibre.utils.ipc import eintr_retry_call
from calibre.utils.config_base import tweaks from calibre.utils.config_base import tweaks
@ -114,10 +113,11 @@ class ConnectionListener(Thread):
packet = self.driver.broadcast_socket.recvfrom(100) packet = self.driver.broadcast_socket.recvfrom(100)
remote = packet[1] remote = packet[1]
content_server_port = b'' content_server_port = b''
try : try:
from calibre.library.server import server_config as content_server_config
content_server_port = \ content_server_port = \
str(content_server_config().parse().port) str(content_server_config().parse().port)
except: except Exception:
pass pass
message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' + message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' +
str(socket.gethostname().partition('.')[0]) + str(socket.gethostname().partition('.')[0]) +