[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     1016f0f3e15eb6a4e7cd203a35554d8c335e3e0a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:14:48 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 05:14:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1016f0f3

lint: clean up a few minor warnings

Should be no real functional changes here.

 catalyst/base/stagebase.py | 3 ---
 catalyst/main.py           | 4 +---
 catalyst/support.py        | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 98c4959..9d3841c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -5,9 +5,6 @@ import shutil
 import sys
 from stat import ST_UID, ST_GID, ST_MODE
 
-# for convienience
-pjoin = os.path.join
-
 from snakeoil import fileutils
 
 from DeComp.compress import CompressMap

diff --git a/catalyst/main.py b/catalyst/main.py
index 5b6b9ac..7c6a5d8 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -13,8 +13,6 @@ import sys
 
 from snakeoil import process
 
-__selfpath__ = os.path.abspath(os.path.dirname(__file__))
-
 from DeComp.definitions import (COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS,
 	CONTENTS_DEFINITIONS)
 from DeComp.contents import ContentsMap
@@ -63,7 +61,7 @@ def parse_config(config_files):
 			conf_values[x]=confdefaults[x]
 
 	# add our python base directory to use for loading target arch's
-	conf_values["PythonDir"] = __selfpath__
+	conf_values["PythonDir"] = os.path.dirname(os.path.realpath(__file__))
 
 	# print out any options messages
 	for opt in conf_values['options']:

diff --git a/catalyst/support.py b/catalyst/support.py
index 4efe96c..d13422d 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -21,8 +21,7 @@ def list_bashify(mylist):
 		# surround args with quotes for passing to bash,
 		# allows things like "<" to remain intact
 		mypack[x]="'"+mypack[x]+"'"
-	mypack = ' '.join(mypack)
-	return mypack
+	return ' '.join(mypack)
 
 
 class CatalystError(Exception):