[Autotest,KVM-AUTOTEST,2/4] Make kvm_config.py to use internal/standard exeptions

Commit Message

Michael Goldish June 10, 2009, 12:21 p.m. UTC

Looks fine to me.

BTW, I think debug_print() should be prefixed by a single underscore, not two.
A double underscore should be used only when name mangling is required -- at least that's what I understood from PEP 8.
Let me know what you think.

Thanks,
Michael

----- Original Message -----
From: "Lucas Meneghel Rodrigues" <[e-mail]>
To: [e-mail]
Cc: [e-mail]
Sent: Tuesday, June 9, 2009 7:33:27 PM (GMT+0200) Auto-Detected
Subject: [Autotest] [KVM-AUTOTEST PATCH 2/4] Make kvm_config.py to use internal/standard exeptions

Instead of resorting to internal autotest exception types, use
either python standard exceptions or an internally defined
ConfigError exception.

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

Patch

diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py
index a3467a0..cce931a 100755
--- a/client/tests/kvm/kvm_config.py
+++ b/client/tests/kvm/kvm_config.py
@@ -8,6 +8,11 @@  KVM configuration file utility functions.
 @copyright: Red Hat 2008-2009
 """
 
+
+class ConfigError(Exception):
+    pass
+
+
 class config:
     """
     Parse an input file or string that follows the KVM Test Config File format
@@ -47,7 +52,7 @@  class config:
             @param filename: Path of the configuration file.
         """
         if not os.path.exists(filename):
-            raise Exception, "File %s not found" % filename
+            raise IOError("File %s not found" % filename)
         self.filename = filename
         file = open(filename, "r")
         self.list = self.parse(file, self.list)
@@ -357,7 +362,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 ConfigError(e_msg)
                 if self.debug and not restricted:
                     self.__debug_print(indented_line,
                                      "Entering variants block (%d dicts in"
@@ -402,7 +407,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 ConfigError(e_msg)
                     new_file = open(filename, "r")
                     list = self.parse(new_file, list, restricted)
                     new_file.close()
@@ -410,7 +415,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 ConfigError(e_msg)
 
             # Parse multi-line exceptions
             # (the block is parsed for each dict separately)