From 462ae5b9e24145943ac70f3441477b49285da56c Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 16 May 2010 21:13:34 +0100
Subject: [PATCH] Clean up eject_device

---
 src/calibre/devices/folder_device/driver.py | 3 +++
 src/calibre/devices/usbms/driver.py         | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index e7d09675c7..f85fca55e1 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -88,6 +88,9 @@ class FOLDER_DEVICE(USBMS):
     def get_main_ebook_dir(self):
         return ''
 
+    def eject(self):
+        self.is_connected = False
+
     @classmethod
     def settings(self):
         return FOLDER_DEVICE_FOR_CONFIG._config().parse()
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index c5b3d653c3..332f337a2f 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -248,6 +248,8 @@ class USBMS(CLI, Device):
 
     @classmethod
     def normalize_path(cls, path):
+        if path is None:
+            return None
         if os.sep == '\\':
             path = path.replace('/', '\\')
         else: