From f91028fed0be345189d9e179c9eceb1c7a6098c4 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Tue, 20 Jan 2009 18:28:58 -0500
Subject: [PATCH 1/2] Fix typos

---
 src/calibre/devices/usbms/device.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index ef2800b1cc..c9a9c2a942 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -6,7 +6,7 @@ intended to be subclassed with the relevant parts implemented for a particular
 device. This class handles devive detection.
 '''
 
-import os, subprocess, time
+import os, re, subprocess, time
 
 from calibre.devices.interface import Device as _Device
 from calibre.devices.errors import DeviceError
@@ -188,8 +188,8 @@ class Device(_Device):
         if not drives:
             raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.') % self.__class__.__name__)
             
-        self._main_prefix = drives['main'] if 'main' in names.keys() else None
-        self._card_prefix = drives['card'] if 'card' in names.keys() else None
+        self._main_prefix = drives['main'] if 'main' in drives.keys() else None
+        self._card_prefix = drives['card'] if 'card' in drives.keys() else None
 
     @classmethod
     def get_osx_mountpoints(self, raw=None):

From eba26565b8b9eb60e7bcbe9db36536b285f3545d Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Tue, 20 Jan 2009 18:33:49 -0500
Subject: [PATCH 2/2] Fix errors found by pylint

---
 src/calibre/devices/cybookg3/driver.py |  1 +
 src/calibre/devices/usbms/driver.py    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index ea6376df0d..66e6097371 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -7,6 +7,7 @@ Device driver for Bookeen's Cybook Gen 3
 import os, shutil
 from itertools import cycle
 
+from calibre.devices.errors import FreeSpaceError
 from calibre.devices.usbms.driver import USBMS
 import calibre.devices.cybookg3.t2b as t2b
 
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index 75f04219e7..1edf406d0b 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -11,9 +11,22 @@ from itertools import cycle
 
 from calibre.devices.usbms.device import Device
 from calibre.devices.usbms.books import BookList, Book
-from calibre.devices.errors import FreeSpaceError
+from calibre.devices.errors import FreeSpaceError, PathError
 from calibre.devices.mime import MIME_MAP
 
+class File(object):
+    def __init__(self, path):
+        stats = os.stat(path)
+        self.is_dir = os.path.isdir(path)
+        self.is_readonly = not os.access(path, os.W_OK)
+        self.ctime = stats.st_ctime
+        self.wtime = stats.st_mtime
+        self.size  = stats.st_size
+        if path.endswith(os.sep):
+            path = path[:-1]
+        self.path = path
+        self.name = os.path.basename(path)
+
 class USBMS(Device):
     FORMATS = []
     EBOOK_DIR_MAIN = ''