From c90f9a1c440154413781c0500051bf138a7e6259 Mon Sep 17 00:00:00 2001 From: Li Fanxi Date: Wed, 8 Dec 2010 02:01:23 +0800 Subject: [PATCH] Improve the code to pass setup.py check --- src/calibre/devices/bambook/driver.py | 2 -- src/calibre/devices/bambook/libbambookcore.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/devices/bambook/driver.py b/src/calibre/devices/bambook/driver.py index 77f8bacbcd..d1cd507d70 100644 --- a/src/calibre/devices/bambook/driver.py +++ b/src/calibre/devices/bambook/driver.py @@ -153,7 +153,6 @@ class BAMBOOK(DeviceConfig, DevicePlugin): booklist = self.booklist_class(oncard, prefix, self.settings) need_sync = self.parse_metadata_cache(booklist) - from calibre.ebooks.metadata.book.base import Metadata devicebooks = self.bambook.GetBookList() books = [] for book in devicebooks: @@ -242,7 +241,6 @@ class BAMBOOK(DeviceConfig, DevicePlugin): to :meth:`add_books_to_metadata`. ''' self.report_progress(0, _('Transferring books to device...')) - booklist = [] paths = [] if self.bambook: for (i, f) in enumerate(files): diff --git a/src/calibre/devices/bambook/libbambookcore.py b/src/calibre/devices/bambook/libbambookcore.py index 21b25302be..f19b205df2 100644 --- a/src/calibre/devices/bambook/libbambookcore.py +++ b/src/calibre/devices/bambook/libbambookcore.py @@ -9,7 +9,7 @@ Sanda library wrapper ''' import ctypes, uuid, hashlib -from threading import Event, Thread, Lock +from threading import Event, Lock from calibre.constants import iswindows, islinux try: @@ -137,7 +137,7 @@ def BambookDisconnect(handle): # extern "C" const char * BambookGetErrorString(BB_RESULT nCode) def BambookGetErrorString(code): func = lib_handle.BambookGetErrorString - func.restype = c_char_p + func.restype = ctypes.c_char_p return func(code)