Merge lp:~cmiller/desktopcouch/code-split-changes-relative-path-to-configs into lp:desktopcouch

[Chad Miller]

Fix a problem with splitting code into packages. The relative path to config directories was no longer valid.

[Eric Casteleijn (thisfred)]

Awesome job, looks good.

line 193 in start_local_couchdb.py is too long now, if you fix that +1

review: Approve

[dobey (dobey)]

The path string should be built with os.path.join() so that it also works correctly on other platforms that don't use / as the separator character.

review: Needs Fixing

[lp:~cmiller/desktopcouch/code-split-changes-relative-path-to-configs]

219. By Chad Miller on 2010-11-23

Use OS-independent functions to locate files.

220. By Chad Miller on 2010-11-23

Fix minor lint complaint about exception instance names.

221. By Chad Miller on 2010-11-23

Remove debugging statement.

[dobey (dobey)]

review: Approve

=== modified file 'desktopcouch/application/start_local_couchdb.py'
--- desktopcouch/application/start_local_couchdb.py	2010-11-22 18:21:40 +0000
+++ desktopcouch/application/start_local_couchdb.py	2010-11-23 19:56:32 +0000
@@ -67,16 +67,16 @@
             try:
                 retcode = proc.wait()
                 break
-            except OSError, e:
-                if e.errno == errno.EINTR:
+            except OSError, ex:
+                if ex.errno == errno.EINTR:
                     continue
                 raise
         if retcode < 0:
             print >> sys.stderr, "Child was terminated by signal", -retcode
         elif retcode > 0:
             print >> sys.stderr, "Child returned", retcode
-    except OSError, e:
-        print >> sys.stderr, "Execution failed: %s: %s" % (e, local_exec)
+    except OSError, ex:
+        print >> sys.stderr, "Execution failed: %s: %s" % (ex, local_exec)
         exit(1)
 
     # give the process a chance to start
@@ -99,13 +99,13 @@
             port = find_port(pid=pid, ctx=ctx)
             # returns valid port, or raises exception
             break
-        except RuntimeError, e:
+        except RuntimeError:
             pass
 
         try:
             # Send no signal, merely test PID existence.
             os.kill(pid, 0)
-        except OSError, e:
+        except OSError:
             raise RuntimeError("Couchdb PID%d exited.  Permissions?" % (pid,))
 
         time.sleep(timeout)
@@ -193,16 +193,15 @@
         raise IOError(
             "Bookmark file is corrupt.  Username/password are missing.")
 
-    if os.path.exists(
-            os.path.join(os.path.split(__file__)[0], "../data/couchdb.tmpl")):
-        bookmark_template = os.path.join(
-            os.path.split(__file__)[0], "../data/couchdb.tmpl")
+    src_tmpl = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
+                            "data", "couchdb.tmpl")
+    if os.path.exists(src_tmpl):
+        bookmark_template = src_tmpl
     else:
         for base in xdg.BaseDirectory.xdg_data_dirs:
             template_path = os.path.join(base, "desktopcouch", "couchdb.tmpl")
             if os.path.exists(template_path):
-                bookmark_template = os.path.join(
-                    os.path.split(__file__)[0], template_path)
+                bookmark_template = os.path.abspath(template_path)
 
     fp = open(bookmark_template)
     html = fp.read()
@@ -229,8 +228,8 @@
         try:
             pid, port = run_couchdb(ctx=ctx)
             break
-        except RuntimeError, e:
-            saved_exception = e
+        except RuntimeError, ex:
+            saved_exception = ex
             logging.exception("Starting couchdb failed on try %d", (retry,))
             time.sleep(1)
             continue

=== modified file 'desktopcouch/application/tests/test_local_files.py'
--- desktopcouch/application/tests/test_local_files.py	2010-11-19 00:45:03 +0000
+++ desktopcouch/application/tests/test_local_files.py	2010-11-23 19:56:32 +0000
@@ -22,6 +22,17 @@
         cf = test_environment.test_context.configuration
         # Test loading from file.
         cf._fill_from_file(test_environment.test_context.file_ini)
+        self.xdg_path = os.environ.get("XDG_CONFIG_DIRS")
+        os.environ["XDG_CONFIG_DIRS"] = os.path.join(
+                os.path.dirname(__file__), os.pardir, os.pardir, 
+                os.pardir, "config")
+
+    def tearDown(self):
+        super(TestLocalFiles, self).tearDown()
+        if self.xdg_path is None:
+            del os.environ["XDG_CONFIG_DIRS"]
+        else:
+            os.environ["XDG_CONFIG_DIRS"] = self.xdg_path
 
     def test_all_files_returned(self):
         """Check local_files lists all the files that it needs to."""