From cbdb05978b8be7764ed3efd9f773b570df58b7bb Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 31 Jul 2012 17:41:44 +0530 Subject: [PATCH 1/3] Use context manager instead of acquire()/release() --- src/calibre/devices/smart_device_app/driver.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py index c63c04b7a6..8f59d310c8 100644 --- a/src/calibre/devices/smart_device_app/driver.py +++ b/src/calibre/devices/smart_device_app/driver.py @@ -36,13 +36,9 @@ def synchronous(tlockname): def _synched(func): @wraps(func) - def _synchronizer(self,*args, **kwargs): - tlock = self.__getattribute__( tlockname) - tlock.acquire() - try: + def _synchronizer(self, *args, **kwargs): + with self.__getattribute__(tlockname): return func(self, *args, **kwargs) - finally: - tlock.release() return _synchronizer return _synched From 4b13f6079b4c08c5aa9855651c96ecb501377d81 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 31 Jul 2012 17:44:29 +0530 Subject: [PATCH 2/3] ... --- src/calibre/devices/kindle/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py index a12ad5ebce..1971faef60 100644 --- a/src/calibre/devices/kindle/driver.py +++ b/src/calibre/devices/kindle/driver.py @@ -13,7 +13,6 @@ import datetime, os, re, sys, json, hashlib from calibre.devices.kindle.bookmark import Bookmark from calibre.devices.usbms.driver import USBMS from calibre import strftime -from calibre.utils.logging import default_log ''' Notes on collections: @@ -389,6 +388,7 @@ class KINDLE2(KINDLE): self.upload_apnx(path, filename, metadata, filepath) def upload_kindle_thumbnail(self, metadata, filepath): + from calibre.utils.logging import default_log coverdata = getattr(metadata, 'thumbnail', None) if not coverdata or not coverdata[2]: return From ca05e82c1bcc7e09928bb789250801974b5a33f8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 31 Jul 2012 17:55:54 +0530 Subject: [PATCH 3/3] ... --- src/calibre/devices/smart_device_app/driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py index 8f59d310c8..5a2833ef7e 100644 --- a/src/calibre/devices/smart_device_app/driver.py +++ b/src/calibre/devices/smart_device_app/driver.py @@ -460,12 +460,12 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): ans = select.select((self.listen_socket,), (), (), 0) if len(ans[0]) > 0: # timeout in 10 ms to detect rare case where the socket went - # way between the select and the accent + # way between the select and the accept try: self.device_socket = None self.listen_socket.settimeout(0.010) - self.device_socket, ign = \ - eintr_retry_call(self.listen_socket.accept) + self.device_socket, ign = eintr_retry_call( + self.listen_socket.accept) self.listen_socket.settimeout(None) self.device_socket.settimeout(None) self.is_connected = True