From 859e3caa53b3df61f2248c13589e057fd20ac697 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Mar 2011 09:20:47 -0700
Subject: [PATCH] Pass none for library_uuid when opening a device in contexts
 where no library is available

---
 src/calibre/devices/__init__.py        | 3 +--
 src/calibre/devices/prs500/cli/main.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index 0d62a8f619..1918a36cc8 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -30,7 +30,6 @@ def strftime(epoch, zone=time.gmtime):
 def get_connected_device():
     from calibre.customize.ui import device_plugins
     from calibre.devices.scanner import DeviceScanner
-    import uuid
     dev = None
     scanner = DeviceScanner()
     scanner.scan()
@@ -48,7 +47,7 @@ def get_connected_device():
 
     for d in connected_devices:
         try:
-            d.open(str(uuid.uuid4()))
+            d.open()
         except:
             continue
         else:
diff --git a/src/calibre/devices/prs500/cli/main.py b/src/calibre/devices/prs500/cli/main.py
index 8a73f3fa23..6d568b01a2 100755
--- a/src/calibre/devices/prs500/cli/main.py
+++ b/src/calibre/devices/prs500/cli/main.py
@@ -6,7 +6,7 @@ Provides a command-line and optional graphical interface to the SONY Reader PRS-
 For usage information run the script.
 """
 
-import StringIO, sys, time, os, uuid
+import StringIO, sys, time, os
 from optparse import OptionParser
 
 from calibre import __version__, __appname__
@@ -213,7 +213,7 @@ def main():
 
     for d in connected_devices:
         try:
-            d.open(str(uuid.uuid4()))
+            d.open(None)
         except:
             continue
         else: