Merge lp:~johnf-inodes/autoppa/editor into lp:autoppa

[John Ferlito]

[Jamu Kakar (jkakar)]

Thanks for the changes! I've merged it with some minor tweaks:

- I removed BuildTarget.default_editor and added a module-level
  DEFAULT_EDITOR constant and updated the test to match the change.

- I fixed the typo in the path to sensible-editor.

review: Approve

=== modified file 'autoppa/target.py'
--- autoppa/target.py	2009-09-21 01:35:24 +0000
+++ autoppa/target.py	2009-10-21 13:05:20 +0000
@@ -73,6 +73,7 @@
         self.system = system
         self.version_replacement = True
         self._prepared_files = set()
+        self.default_editor = "/usr/bin/sensible_editor"
 
     def _log_info(self, message):
         """Write C{message} the log, if one is present."""
@@ -99,6 +100,8 @@
             editor = os.environ["VISUAL"]
         elif "EDITOR" in os.environ:
             editor = os.environ["EDITOR"]
+        elif os.path.exists(self.default_editor):
+            editor = self.default_editor
         else:
             raise EditorError("The VISUAL or EDITOR environment variable must "
                               "be set to prepare the changelog.")

=== modified file 'autoppa/tests/test_target.py'
--- autoppa/tests/test_target.py	2009-09-21 01:20:28 +0000
+++ autoppa/tests/test_target.py	2009-10-21 13:05:20 +0000
@@ -73,7 +73,7 @@
         self.assertEquals(commands[1], ("run", command,
                                         {"log_file": None, "timeout": None}))
 
-    def test_prepare_changelog_without_editor_environment_variable(self):
+    def test_prepare_changelog_without_editor_environment_or_default_cmd(self):
         """
         L{BuildTarget.prepare_changelog} relies on a VISUAL or EDITOR
         environment variable.  An L{EditorError} is raised when they're not
@@ -83,10 +83,13 @@
         try:
             if original_editor:
                 del os.environ["EDITOR"]
+            original_default_editor = self.builder.default_editor
+            self.builder.default_editor = "/tmp/random_path/that/doesn't exist"
             self.assertRaises(EditorError, self.builder.prepare_changelog)
         finally:
             if original_editor is not None:
                 os.environ["EDITOR"] = original_editor
+            self.builder.default_editor = original_default_editor
 
     def test_prepare_changelog_without_content(self):
         """