From patchwork Mon Jun 8 06:07:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 28556 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n58683Lh020117 for ; Mon, 8 Jun 2009 06:08:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbZFHGH6 (ORCPT ); Mon, 8 Jun 2009 02:07:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751565AbZFHGH6 (ORCPT ); Mon, 8 Jun 2009 02:07:58 -0400 Received: from mx1.redhat.com ([66.187.233.31]:33245 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751296AbZFHGH5 (ORCPT ); Mon, 8 Jun 2009 02:07:57 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n58680NJ024420 for ; Mon, 8 Jun 2009 02:08:00 -0400 Received: from mail05.corp.redhat.com (zmail05.collab.prod.int.phx2.redhat.com [10.5.5.46]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5867wE7003236; Mon, 8 Jun 2009 02:07:59 -0400 Date: Mon, 8 Jun 2009 02:07:58 -0400 (EDT) From: Michael Goldish To: Lucas Meneghel Rodrigues Cc: kvm@vger.kernel.org Message-ID: <1191002737.1397221244441278802.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> In-Reply-To: <1321633905.1397161244441001336.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> Subject: Re: [PATCH 1/3] Make possible to use kvm_config as a standalone program. MIME-Version: 1.0 X-Originating-IP: [10.5.5.71] X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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" To: kvm@vger.kernel.org Cc: "Lucas Meneghel Rodrigues" 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 --- client/tests/kvm/kvm_config.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) 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)