From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7305B1381F3 for ; Sun, 13 Oct 2013 09:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D2C1E0982; Sun, 13 Oct 2013 09:07:42 +0000 (UTC) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED501E0982 for ; Sun, 13 Oct 2013 09:07:41 +0000 (UTC) Received: by mail-pd0-f182.google.com with SMTP id r10so6140739pdi.41 for ; Sun, 13 Oct 2013 02:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hicpn8ygL0GLCSuvJ65pQ5s+DKhA8lGyI23Kn2VhjXM=; b=tM74KPr8cdGhLLdr3Q3VExBvgsY1qcg8OZFBhqR4ZxmMZw339pIezOlm+ySaCgk2ad b4/h03Z3PAhCTPnApFYc/sbyIzvZd7qpn+fl588oMeg1/1eSrR6vbNy2CZi4sf45ToLa F6VmoZiz4Lw1d4zC4dt4TLrs/JneQupMTWMdUsNZ8ws9C8jS69tCTpWx3LIF3wMX+jp8 0QANUpXNSIY3v0vwTRQYXIa9U9N6mYE3tOXIPwapdJcLc4iWXq/HxvQzpgvKTa19D9n3 JstupsMBVAiHFoIwdtljwAXZh0Yg6y4m7cHl/nH747tFY1JL61sxbrghdCfmrW0XwC30 bt6Q== X-Received: by 10.68.232.3 with SMTP id tk3mr29904868pbc.121.1381655260813; Sun, 13 Oct 2013 02:07:40 -0700 (PDT) Received: from moiraine.shinigami ([50.126.105.238]) by mx.google.com with ESMTPSA id kd1sm82991001pab.20.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 13 Oct 2013 02:07:40 -0700 (PDT) From: Dylan Baker To: gentoo-catalyst@lists.gentoo.org Cc: Dylan Baker Subject: [gentoo-catalyst] [Patch v2 2/4] Catalyst: use a more pythonic method to import modules Date: Sun, 13 Oct 2013 02:07:36 -0700 Message-Id: <1381655258-6084-2-git-send-email-baker.dylan.c@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1381655258-6084-1-git-send-email-baker.dylan.c@gmail.com> References: <1381655258-6084-1-git-send-email-baker.dylan.c@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: d17d2ebe-87fe-4bab-8fba-865aaf44660e X-Archives-Hash: 011a8bc350570885170583bec34bdcd1 Rather than appending a directory to the system path, this patch adds a __init__.py file to modules, which allows python to search it, and it's children for python modules. This also requires changes to a few of the module files to make them happy. --- catalyst | 16 ++++++---------- modules/__init__.py | 0 modules/catalyst/config.py | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 modules/__init__.py diff --git a/catalyst b/catalyst index 11560fb..2378a87 100755 --- a/catalyst +++ b/catalyst @@ -11,12 +11,8 @@ import os, sys, imp, string, getopt import pdb import os.path -__selfpath__ = os.path.abspath(os.path.dirname(__file__)) - -sys.path.append(__selfpath__ + "/modules") - -import catalyst.config -import catalyst.util +import modules.catalyst.config +import modules.catalyst.util __maintainer__="Catalyst " __version__="2.0.14" @@ -91,7 +87,7 @@ def parse_config(myconfig): # now, try and parse the config file "config_file" try: # execfile(config_file, myconf, myconf) - myconfig = catalyst.config.ConfigParser(config_file) + myconfig = modules.catalyst.config.ConfigParser(config_file) myconf.update(myconfig.get_values()) except: @@ -226,7 +222,7 @@ def build_target(addlargs, targetmap): mytarget.run() except: - catalyst.util.print_traceback() + modules.catalyst.util.print_traceback() print "!!! catalyst: Error encountered during run of target " + addlargs["target"] sys.exit(1) @@ -379,12 +375,12 @@ if __name__ == "__main__": addlargs={} if myspecfile: - spec = catalyst.config.SpecParser(myspecfile) + spec = modules.catalyst.config.SpecParser(myspecfile) addlargs.update(spec.get_values()) if mycmdline: try: - cmdline = catalyst.config.ConfigParser() + cmdline = modules.catalyst.config.ConfigParser() cmdline.parse_lines(mycmdline) addlargs.update(cmdline.get_values()) except CatalystError: diff --git a/modules/__init__.py b/modules/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py index 00da343..726bf74 100644 --- a/modules/catalyst/config.py +++ b/modules/catalyst/config.py @@ -1,5 +1,5 @@ import re -from catalyst_support import * +from modules.catalyst_support import * class ParserBase: -- 1.8.1.5