Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 16:33:43 +02:00
Code Issues 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.book.base import Metadata
from calibre.ebooks.metadata.book.json_codec import JsonCodec
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.utils.ipc import eintr_retry_call
from calibre.utils.config_base import tweaks
@ -114,10 +113,11 @@ def run(self):
packet = self.driver.broadcast_socket.recvfrom(100)
remote = packet[1]
content_server_port = b''
try :
try:
from calibre.library.server import server_config as content_server_config
content_server_port = \
str(content_server_config().parse().port)
except:
except Exception:
pass
message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' +
str(socket.gethostname().partition('.')[0]) +