Merge lp:~statik/desktopcouch/server-problems into lp:desktopcouch

[Elliot Murphy]

    Don't trigger the desktopcouch path searching and automatic couch startup
    behavior when desktopcouch is imported, this module is used in server
    environments also and thats not very friendly for servers.

    Also: never, ever call sys.exit() during module import. raise an
    ImportError instead so that it's possible to debug.

[Elliot Murphy (statik)]

Fixes some major problems with using the desktopcouch module in server environments.

[Philip Fibiger (pfibiger)]

our servers thank you.

review: Approve

=== modified file 'desktopcouch/__init__.py'
--- desktopcouch/__init__.py	2009-07-28 11:32:07 +0000
+++ desktopcouch/__init__.py	2009-07-28 17:56:10 +0000
@@ -18,12 +18,12 @@
 from __future__ import with_statement
 import os
 import re
-from desktopcouch import local_files
 import errno
 import time
 
 def find_pid():
     # Work out whether CouchDB is running by looking at its pid file
+    from desktopcouch import local_files
     fp = open(local_files.FILE_PID)
     pid = int(fp.read())
     fp.close()

=== modified file 'desktopcouch/local_files.py'
--- desktopcouch/local_files.py	2009-07-24 18:34:34 +0000
+++ desktopcouch/local_files.py	2009-07-28 17:56:10 +0000
@@ -62,8 +62,7 @@
         if os.path.exists(os.path.join(x, 'couchdb')):
             COUCH_EXE = os.path.join(x, 'couchdb')
 if not COUCH_EXE:
-    print "Could not find couchdb"
-    sys.exit(1)
+    raise ImportError("Could not find couchdb")
 
 def couch_chain_flag():
     process = subprocess.Popen([COUCH_EXE, '-V'], shell=False,