From d7b1624ec63aa0d97c22bb1bbe0bb2f52b5dc06e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 2 Feb 2012 23:11:40 +0530
Subject: [PATCH] cleanups

---
 src/calibre/devices/scanner.py      |  2 --
 src/calibre/devices/usbms/device.py | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py
index dd0cb12d73..012708b0da 100644
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@@ -160,7 +160,6 @@ class FreeBSDScanner(object):
     def __call__(self):
         ans = set([])
         import dbus
-        devs = []
 
         try:
            bus = dbus.SystemBus()
@@ -170,7 +169,6 @@ class FreeBSDScanner(object):
            for path in paths:
               obj = bus.get_object('org.freedesktop.Hal', path)
               objif = dbus.Interface(obj, 'org.freedesktop.Hal.Device')
-              devif = objif
               parentdriver = None
               while parentdriver != 'umass':
                  try:
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 1aa6dd1a40..6765c3e9c0 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -700,9 +700,9 @@ class Device(DeviceConfig, DevicePlugin):
         if not d.serial:
             raise DeviceError("Device has no S/N.  Can't continue")
             return False
-        
+
         vols=[]
-        
+
         bus = dbus.SystemBus()
         manager = dbus.Interface(bus.get_object('org.freedesktop.Hal',
                       '/org/freedesktop/Hal/Manager'), 'org.freedesktop.Hal.Manager')
@@ -718,7 +718,7 @@ class Device(DeviceConfig, DevicePlugin):
                         d.serial == objif.GetProperty('usb.serial'):
                     dpaths = manager.FindDeviceStringMatch('storage.originating_device', path)
                     for dpath in dpaths:
-                        devif = dbus.Interface(bus.get_object('org.freedesktop.Hal', dpath), 'org.freedesktop.Hal.Device')
+                        #devif = dbus.Interface(bus.get_object('org.freedesktop.Hal', dpath), 'org.freedesktop.Hal.Device')
                         try:
                             vpaths = manager.FindDeviceStringMatch('block.storage_device', dpath)
                             for vpath in vpaths:
@@ -755,7 +755,7 @@ class Device(DeviceConfig, DevicePlugin):
 
         if verbose:
             print "FBSD:	", vols
-        
+
         mtd=0
 
         for vol in vols:
@@ -763,8 +763,6 @@ class Device(DeviceConfig, DevicePlugin):
             if vol['dev'].GetProperty('volume.is_mounted'):
                 mp = vol['dev'].GetProperty('volume.mount_point')
             else:
-                if verbose:
-                    print "FBSD:	trying ", vol['label'], "on", 'Calibre-'+labels[i]
                 try:
                     vol['vol'].Mount('Calibre-'+vol['label'],
                             vol['dev'].GetProperty('volume.fstype'), [])