From 426cde07dd975454502f1317a04acfea75f80906 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Wed, 7 Jan 2009 19:46:36 -0500
Subject: [PATCH] Merge CLI class into Driver

---
 src/calibre/devices/cybookg3/driver.py |  3 +--
 src/calibre/devices/kindle/driver.py   |  3 +--
 src/calibre/devices/usbms/cli.py       | 16 ----------------
 src/calibre/devices/usbms/driver.py    |  2 ++
 4 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 src/calibre/devices/usbms/cli.py

diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index d367a23fc4..e3c0c1747a 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -7,9 +7,8 @@ Device driver for Bookeen's Cybook Gen 3
 import os, fnmatch
 
 from calibre.devices.usbms.driver import USBMS
-from calibre.devices.usbms.cli import CLI
 
-class CYBOOKG3(USBMS, CLI):
+class CYBOOKG3(USBMS):
     MIME_MAP   = { 
                 'mobi' : 'application/mobi',
                 'prc' : 'application/prc',
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 29152c4186..06c3b1cf27 100755
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -7,9 +7,8 @@ Device driver for Amazon's Kindle
 import os, fnmatch
 
 from calibre.devices.usbms.driver import USBMS
-from calibre.devices.usbms.cli import CLI
 
-class KINDLE(USBMS, CLI):
+class KINDLE(USBMS):
     MIME_MAP   = { 
                 'azw' : 'application/azw',
                 'mobi' : 'application/mobi',
diff --git a/src/calibre/devices/usbms/cli.py b/src/calibre/devices/usbms/cli.py
deleted file mode 100644
index 35a3a84824..0000000000
--- a/src/calibre/devices/usbms/cli.py
+++ /dev/null
@@ -1,16 +0,0 @@
-__license__   = 'GPL v3'
-__copyright__ = '2009, John Schember <john at nachtimwald.com'
-'''
-Generic implemenation of the prs500 command line functions. This is not a
-complete stand alone driver. It is intended to be subclassed with the relevant
-parts implemented for a particular device.
-'''
-
-class CLI(object):
-
-# ls, cp, mkdir, touch, cat,
-       
-    def rm(self, path, end_session=True):
-        path = self.munge_path(path)
-        self.delete_books([path])
-        
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index a91ce10425..4e6d423927 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -141,3 +141,5 @@ class USBMS(Device):
             
         return book_title, book_author, book_mime
 
+# ls, rm, cp, mkdir, touch, cat
+