[1/3] Make possible to use kvm_config as a standalone program.

Commit Message

Michael Goldish June 8, 2009, 6:07 a.m. UTC

1. It would also be nice to add a '#!/usr/bin/python' line at the beginning of the file, so I can make the file executable and run it without the 'python' prefix.
2. I think you missed the exception raised in parse_file().
3. Wouldn't it be a good idea to define our own ConfigError exception class and raise it instead of ValueError or IOError?

Thanks,
Michael

----- Original Message -----
From: "Lucas Meneghel Rodrigues" <[e-mail]>
To: [e-mail]
Cc: "Lucas Meneghel Rodrigues" <[e-mail]>
Sent: Monday, June 8, 2009 7:01:47 AM (GMT+0200) Auto-Detected
Subject: [PATCH 1/3] Make possible to use kvm_config as a standalone program.

Replace autotest exceptions for standard python exceptions. This
will allow kvm_config.py to be used as a stand alone program.

Signed-off-by: Lucas Meneghel Rodrigues <[e-mail]>
---
 client/tests/kvm/kvm_config.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py
index 8b6ab15..dda421b 100755
--- a/client/tests/kvm/kvm_config.py
+++ b/client/tests/kvm/kvm_config.py
@@ -1,5 +1,4 @@ 
 import re, os, sys, StringIO
-from autotest_lib.client.common_lib import error
 
 """
 KVM configuration file utility functions.
@@ -356,7 +355,7 @@  class config:
                 # (inside an exception or inside subvariants)
                 if restricted:
                     e_msg = "Using variants in this context is not allowed"
-                    raise error.AutotestError()
+                    raise ValueError(e_msg)
                 if self.debug and not restricted:
                     self.__debug_print(indented_line,
                                      "Entering variants block (%d dicts in"
@@ -401,7 +400,7 @@  class config:
                                             words[1])
                     if not os.path.exists(filename):
                         e_msg = "Cannot include %s -- file not found" % filename
-                        raise error.AutotestError(e_msg)
+                        raise IOError(e_msg)
                     new_file = open(filename, "r")
                     list = self.parse(new_file, list, restricted)
                     new_file.close()
@@ -409,7 +408,7 @@  class config:
                         self.__debug_print("", "Leaving file %s" % words[1])
                 else:
                     e_msg = "Cannot include anything because no file is open"
-                    raise error.AutotestError(e_msg)
+                    raise ValueError(e_msg)
 
             # Parse multi-line exceptions
             # (the block is parsed for each dict separately)