Merge lp:~statik/desktopcouch/no-ubuntuone-imports into lp:desktopcouch

[Elliot Murphy]

clean up some import failures when ubuntuone-client is not installed.

[Elliot Murphy (statik)]

when desktopcouch is installed and none of the ubuntuone-client packages are installed, desktopcouch fails to import. it should not do that, and this branch fixes the problem.

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Rodrigo Moya (rodrigo-moya)]

review: Approve

=== modified file 'desktopcouch/local_files.py'
--- desktopcouch/local_files.py	2009-08-03 14:26:13 +0000
+++ desktopcouch/local_files.py	2009-08-05 11:18:46 +0000
@@ -24,7 +24,6 @@
 import os
 import xdg.BaseDirectory
 import subprocess
-import ubuntuone
 
 
 def mkpath(rootdir, path):
@@ -34,6 +33,10 @@
 def u1_is_in_source_tree():
     """If the parent dir of the module directory is "lib", and there is
     a "tmp" dir and a "README" file, then the u1 code is in a source tree."""
+    try:
+        import ubuntuone
+    except ImportError:
+        return False
     u1mod_dir, u1mod_file = os.path.split(ubuntuone.__file__)
     if u1mod_dir.split(os.sep)[-2] != "lib":
         return False
@@ -46,10 +49,10 @@
         return False
 
     return True
-    
 
 
 if u1_is_in_source_tree():
+    import ubuntuone
     rootdir = os.path.join(os.path.split(ubuntuone.__file__)[0], "..", "..", "tmp")
     FILE_INI = mkpath(rootdir, "desktop-couchdb.ini")
     DIR_DB = mkpath(rootdir, "desktop-couch-files")

=== modified file 'desktopcouch/records/record.py'
--- desktopcouch/records/record.py	2009-07-08 17:48:11 +0000
+++ desktopcouch/records/record.py	2009-08-05 11:18:46 +0000
@@ -21,11 +21,7 @@
 """A dictionary based record representation."""
 
 import re
-
-try:
-    from ubuntuone.contrib import uuid
-except ImportError:
-    import uuid
+import uuid
 
 RX = re.compile('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')