drop trailing whitespace

Should be no functional changes here.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

20 files changed, 97 insertions, 97 deletions

diff --git a/pym/gentoolkit/cpv.py b/pym/gentoolkit/cpv.py
index 9c72431..473ae60 100644
--- a/pym/gentoolkit/cpv.py
+++ b/pym/gentoolkit/cpv.py
@@ -1,4 +1,4 @@
-# Copyright(c) 2005 Jason Stubbs <jstubbs@gentoo.org>                         
+# Copyright(c) 2005 Jason Stubbs <jstubbs@gentoo.org>
 # Copyright(c) 2005-2006 Brian Harring <ferringb@gmail.com>
 # Copyright(c) 2009-2010 Gentoo Foundation
 #
diff --git a/pym/gentoolkit/eclean/exclude.py b/pym/gentoolkit/eclean/exclude.py
index 961bb14..a6422d0 100644
--- a/pym/gentoolkit/eclean/exclude.py
+++ b/pym/gentoolkit/eclean/exclude.py
@@ -156,8 +156,8 @@ def cp_all(categories, portdb=portage.portdb ):
 		"""
 		try:
 			cps = portdb.cp_all(categories)
-			# NOTE: the following backup code should be removed 
-			# when all available versions of portage have the 
+			# NOTE: the following backup code should be removed
+			# when all available versions of portage have the
 			# categories parameter in cp_all()
 		except:  # new behaviour not available
 			#~ message =  "Exception: eclean.exclude.cp_all() " +\
diff --git a/pym/gentoolkit/equery/__init__.py b/pym/gentoolkit/equery/__init__.py
index a844f51..4b108e2 100644
--- a/pym/gentoolkit/equery/__init__.py
+++ b/pym/gentoolkit/equery/__init__.py
@@ -221,8 +221,8 @@ def initialize_configuration():
 
 	if CONFIG['piping']:
 		CONFIG['verbose'] = False
-		# set extra wide, should disable wrapping unless 
-		# there is some extra long text 
+		# set extra wide, should disable wrapping unless
+		# there is some extra long text
 		CONFIG['termWidth'] = 600
 
 	CONFIG['debug'] = bool(os.getenv('DEBUG', False))
diff --git a/pym/gentoolkit/equery/changes.py b/pym/gentoolkit/equery/changes.py
index 1e9be32..0083d95 100644
--- a/pym/gentoolkit/equery/changes.py
+++ b/pym/gentoolkit/equery/changes.py
@@ -182,7 +182,7 @@ def main(input_args):
 				print_entries(changelog.entries_matching_atom(atom)[:end])
 
 		first_run = False
-	
+
 	if not got_match:
 		sys.exit(1)
 
diff --git a/pym/gentoolkit/equery/has.py b/pym/gentoolkit/equery/has.py
index 9ea5f77..15c60b9 100644
--- a/pym/gentoolkit/equery/has.py
+++ b/pym/gentoolkit/equery/has.py
@@ -67,12 +67,12 @@ def print_help(with_description=True):
 		("              TMPL",
 			"a format template using (see man page):")
 	)))
-#	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))			
+#	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))
 
 
 def query_in_env(query, env_var, pkg):
 	"""Check if the query is in the pkg's environment."""
-	
+
 	try:
 		if env_var in ("USE", "IUSE"):
 			results = set(
diff --git a/pym/gentoolkit/equery/hasuse.py b/pym/gentoolkit/equery/hasuse.py
index 80c98fe..aa47974 100644
--- a/pym/gentoolkit/equery/hasuse.py
+++ b/pym/gentoolkit/equery/hasuse.py
@@ -63,7 +63,7 @@ def print_help(with_description=True):
 		("              TMPL",
 			"a format template using (see man page):")
 	)))
-	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))			
+	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))
 
 
 def display_useflags(query, pkg):
diff --git a/pym/gentoolkit/equery/list_.py b/pym/gentoolkit/equery/list_.py
index c859057..214f49b 100644
--- a/pym/gentoolkit/equery/list_.py
+++ b/pym/gentoolkit/equery/list_.py
@@ -85,7 +85,7 @@ def print_help(with_description=True):
         ("              TMPL",
 			"a format template using (see man page):")
 	)))
-	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))			
+	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))
 
 
 def get_duplicates(matches):
diff --git a/pym/gentoolkit/equery/uses.py b/pym/gentoolkit/equery/uses.py
index 8837e02..22e6488 100644
--- a/pym/gentoolkit/equery/uses.py
+++ b/pym/gentoolkit/equery/uses.py
@@ -182,7 +182,7 @@ def get_output_descriptions(pkg, global_usedesc):
 	iuse, final_use = get_flags(pkg.cpv, final_setting=True)
 	usevar = reduce_flags(iuse)
 	usevar.sort()
-	
+
 
 	if pkg.is_installed():
 		used_flags = pkg.use().split()
diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
index f9f9f8c..7828bae 100644
--- a/pym/gentoolkit/metadata.py
+++ b/pym/gentoolkit/metadata.py
@@ -62,7 +62,7 @@ class _Maintainer(object):
 	@type restrict: str or None
 	@ivar restrict: e.g. &gt;=portage-2.2 means only maintains versions
 		of Portage greater than 2.2. Should be DEPEND string with < and >
-		converted to &lt; and &gt; respectively. 
+		converted to &lt; and &gt; respectively.
 	@type status: str or None
 	@ivar status: If set, either 'active' or 'inactive'. Upstream only.
 	"""
diff --git a/pym/gentoolkit/pprinter.py b/pym/gentoolkit/pprinter.py
index 7d8dc2c..fc68444 100644
--- a/pym/gentoolkit/pprinter.py
+++ b/pym/gentoolkit/pprinter.py
@@ -155,8 +155,8 @@ except NameError:
 
 def uprint(*args, **kw):
 	"""Replacement for the builtin print function.
-	
-	This version gracefully handles characters not representable in the 
+
+	This version gracefully handles characters not representable in the
 	user's current locale (through the errors='replace' handler).
 
 	@see: >>> help(print)
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index f992db0..aad8f81 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -19,7 +19,7 @@ from .cache import save_cache
 
 
 def prepare_checks(files_to_check, libraries, bits, cmd_max_args):
-	''' Calls scanelf for all files_to_check, 
+	''' Calls scanelf for all files_to_check,
 	then returns found libraries and dependencies
 	'''
 
@@ -45,7 +45,7 @@ def prepare_checks(files_to_check, libraries, bits, cmd_max_args):
 			else:
 				libs.append(dep)
 				dependencies.append([parts[0],])
-	
+
 	return (libs, dependencies)
 
 
@@ -90,7 +90,7 @@ def extract_dependencies_from_la(la, libraries, to_check, logger):
 								if not _break:
 									continue
 
-							logger.info(yellow(' * ') + _file + 
+							logger.info(yellow(' * ') + _file +
 								' is broken (requires: ' + bold(el)+')')
 							broken.append(_file)
 	return broken
@@ -152,13 +152,13 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 	"""
 
 	if libraries and la_libraries and libraries_links and binaries:
-		logger.info(blue(' * ') + 
+		logger.info(blue(' * ') +
 			bold('Found a valid cache, skipping collecting phase'))
 	else:
 		#TODO: add partial cache (for ex. only libraries)
 		# when found for some reason
 
-		logger.warn(green(' * ') + 
+		logger.warn(green(' * ') +
 			bold('Collecting system binaries and libraries'))
 		bin_dirs, lib_dirs = prepare_search_dirs(logger, settings)
 
@@ -180,7 +180,7 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 		binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logger)
 
 		if settings['USE_TMP_FILES']:
-			save_cache(logger=logger, 
+			save_cache(logger=logger,
 				to_save={'libraries':libraries, 'la_libraries':la_libraries,
 					'libraries_links':libraries_links, 'binaries':binaries
 				},
@@ -188,7 +188,7 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 			)
 
 
-	logger.debug('Found '+ str(len(libraries)) + 
+	logger.debug('Found '+ str(len(libraries)) +
 		' libraries (+' + str(len(libraries_links)) +
 		' symlinks) and ' + str(len(binaries)) +
 		' binaries')
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py
index 96b7eaa..e8e87b3 100644
--- a/pym/gentoolkit/revdep_rebuild/assign.py
+++ b/pym/gentoolkit/revdep_rebuild/assign.py
@@ -80,7 +80,7 @@ def get_best_match(cpv, cp, logger):
 		slot = ['']
 		match = portdb.match(cp)
 		if not match:
-			logger.warn(red('!!') + ' ' + 
+			logger.warn(red('!!') + ' ' +
 				yellow('Could not find ebuild for ' + cp))
 	return match, slot
 
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py
index d62fe12..d6ef7ce 100644
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@ -18,7 +18,7 @@ def read_cache(temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
 		This function does not checks if files exists nor timestamps,
 		check_temp_files should be called first
 		@param temp_path: directory where all temp files should reside
-		@return tuple with values of: 
+		@return tuple with values of:
 			libraries, la_libraries, libraries_links, symlink_pairs, binaries
 	'''
 
@@ -38,17 +38,17 @@ def read_cache(temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
 	except EnvironmentError:
 		pass
 
-	return (ret['libraries'], ret['la_libraries'], 
+	return (ret['libraries'], ret['la_libraries'],
 		ret['libraries_links'], ret['binaries'])
 
 
 def save_cache(logger, to_save=None, temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
 	''' Tries to store caching information.
 		@param logger
-		@param to_save have to be dict with keys: 
+		@param to_save have to be dict with keys:
 			libraries, la_libraries, libraries_links and binaries
 	'''
-	
+
 	if to_save is None:
 		to_save = {}
 
@@ -76,7 +76,7 @@ def check_temp_files(temp_path=DEFAULTS['DEFAULT_TMP_DIR'], max_delay=3600,
 	''' Checks if temporary files from previous run are still available
 		and if they aren't too old
 		@param temp_path is directory, where temporary files should be found
-		@param max_delay is maximum time difference (in seconds) 
+		@param max_delay is maximum time difference (in seconds)
 			when those files are still considered fresh and useful
 		returns True, when files can be used, or False, when they don't
 		exists or they are too old
@@ -120,7 +120,7 @@ if __name__ == '__main__':
 	bin_dirs.update(ld)
 	masked_dirs = masked_dirs.update([
 			'/lib/modules',
-			'/lib32/modules', 
+			'/lib32/modules',
 			'/lib64/modules'
 			]
 		)
@@ -129,8 +129,8 @@ if __name__ == '__main__':
 		collect_libraries_from_dir(lib_dirs, masked_dirs, logging)
 	binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging)
 
-	save_cache(logger=logging, 
-		to_save={'libraries':libraries, 'la_libraries':la_libraries, 
+	save_cache(logger=logging,
+		to_save={'libraries':libraries, 'la_libraries':la_libraries,
 			'libraries_links':libraries_links, 'binaries':binaries}
 		)
 
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py
index 3aae709..740ae32 100644
--- a/pym/gentoolkit/revdep_rebuild/collect.py
+++ b/pym/gentoolkit/revdep_rebuild/collect.py
@@ -92,7 +92,7 @@ def parse_revdep_config(revdep_confdir):
 		for line in open(os.path.join(revdep_confdir, _file)):
 			line = line.strip()
 			#first check for comment, we do not want to regex all lines
-			if not line.startswith('#'): 
+			if not line.startswith('#'):
 				match = re.match('LD_LIBRARY_MASK=\\"([^"]+)\\"', line)
 				if match is not None:
 					masks = match.group(1).split(' ')
@@ -123,7 +123,7 @@ def collect_libraries_from_dir(dirs, mask, logger):
 
 	# contains list of directories found
 	# allows us to reduce number of fnc calls
-	found_directories = []  
+	found_directories = []
 	found_files = []
 	found_symlinks = []
 	found_la_files = [] # la libraries
@@ -146,8 +146,8 @@ def collect_libraries_from_dir(dirs, mask, logger):
 					else:
 						found_directories.append(listing)
 				elif os.path.isfile(listing):
-					if (listing.endswith('.so') or 
-						listing.endswith('.a') or 
+					if (listing.endswith('.so') or
+						listing.endswith('.a') or
 						'.so.' in listing
 						):
 						if listing in found_files or listing in found_symlinks:
@@ -183,7 +183,7 @@ def collect_libraries_from_dir(dirs, mask, logger):
 								found_files.append(listing)
 		except Exception as ex:
 			logger.debug(
-				yellow('Exception during collecting libraries: ' + 
+				yellow('Exception during collecting libraries: ' +
 				blue('%s')  %str(ex)))
 
 
@@ -207,7 +207,7 @@ def collect_binaries_from_dir(dirs, mask, logger):
 
 	# contains list of directories found
 	# allows us to reduce number of fnc calls
-	found_directories = []  
+	found_directories = []
 	found_files = []
 
 	for _dir in dirs:
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py
index abbf72d..8d21b76 100644
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@ -97,8 +97,8 @@ def parse_options():
 
 	settings = DEFAULTS.copy()
 	try:
-		opts, args = getopt.getopt(sys.argv[1:], 
-			'dehiklopqvCL:P', 
+		opts, args = getopt.getopt(sys.argv[1:],
+			'dehiklopqvCL:P',
 			['nocolor', 'debug', 'exact', 'help', 'ignore',
 			'keep-temp', 'library=', 'no-ld-path', 'no-order',
 			'pretend', 'no-pretend', 'no-progress', 'quiet', 'verbose'])
@@ -142,7 +142,7 @@ def parse_options():
 
 def rebuild(logger, assigned, settings):
 	"""rebuilds the assigned pkgs"""
-	
+
 	args = settings['pass_through_options']
 	if settings['EXACT']:
 		emerge_command = '=' + ' ='.join(assigned)
@@ -164,20 +164,20 @@ def rebuild(logger, assigned, settings):
 	emerge_command = emerge_command
 
 	logger.warn(yellow(
-		'\nemerge') + args + 
+		'\nemerge') + args +
 		' --oneshot --complete-graph=y ' +
 		bold(emerge_command))
-	
+
 	success = os.system(
-		'emerge ' + args + 
-		' --oneshot --complete-graph=y ' + 
+		'emerge ' + args +
+		' --oneshot --complete-graph=y ' +
 		emerge_command)
 	return success
 
 
 def main(settings=None, logger=None):
 	"""Main program operation method....
-	
+
 	@param settings: dict.  defaults to settings.DEFAULTS
 	@param logger: python logging module defaults to init_logger(settings)
 	@return boolean  success/failure
@@ -196,20 +196,20 @@ def main(settings=None, logger=None):
 		nocolor()
 
 	#TODO: Development warning
-	logger.warn(blue(' * ') + 
+	logger.warn(blue(' * ') +
 		yellow('This is a development version, '
 			'so it may not work correctly'))
-	logger.warn(blue(' * ') + 
+	logger.warn(blue(' * ') +
 		yellow('The original revdep-rebuild script is '
 			'installed as revdep-rebuild.sh'))
 
 	if os.getuid() != 0 and not settings['PRETEND']:
-		logger.warn(blue(' * ') + 
+		logger.warn(blue(' * ') +
 			yellow('You are not root, adding --pretend to portage options'))
 		settings['PRETEND'] = True
 
 	if settings['library']:
-		logger.warn(green(' * ') + 
+		logger.warn(green(' * ') +
 			"Looking for libraries: %s" % (bold(', '.join(settings['library']))))
 
 	if settings['USE_TMP_FILES'] \
@@ -220,7 +220,7 @@ def main(settings=None, logger=None):
 			settings=settings,
 			logger=logger,
 			libraries=libraries,
-			la_libraries=la_libraries, 
+			la_libraries=la_libraries,
 			libraries_links=libraries_links,
 			binaries=binaries,
 			_libs_to_check=_libs_to_check)
@@ -237,14 +237,14 @@ def main(settings=None, logger=None):
 	for ebuild in assigned:
 		if get_masking_status(ebuild):
 			has_masked = True
-			logger.warn('!!! ' + red('All ebuilds that could satisfy: ') + 
+			logger.warn('!!! ' + red('All ebuilds that could satisfy: ') +
 				green(ebuild) + red(' have been masked'))
 		else:
 			tmp.append(ebuild)
 	assigned = tmp
 
 	if has_masked:
-		logger.info(red(' * ') + 
+		logger.info(red(' * ') +
 			'Unmask all ebuild(s) listed above and call revdep-rebuild '
 			'again or manually emerge given packages.')
 
diff --git a/pym/gentoolkit/revdep_rebuild/settings.py b/pym/gentoolkit/revdep_rebuild/settings.py
index 54d7f9e..2d6046f 100644
--- a/pym/gentoolkit/revdep_rebuild/settings.py
+++ b/pym/gentoolkit/revdep_rebuild/settings.py
@@ -17,12 +17,12 @@ DEFAULTS = {
 		'DEFAULT_TMP_DIR': os.path.join(portage.root, '/var/cache/revdep-rebuild'), #cache default location
 
 		# number of maximum allowed files to be parsed at once
-		'CMD_MAX_ARGS': 1000, 
+		'CMD_MAX_ARGS': 1000,
 
 		'PRETEND': False,     #pretend only
 		'EXACT': False,      #exact package version
 		#if program should use temporary files from previous run
-		'USE_TMP_FILES': True, 
+		'USE_TMP_FILES': True,
 
 		#True for dev. version, False for stable
 		#used when IS_DEV is True, False forces to call emerge with --pretend
@@ -30,7 +30,7 @@ DEFAULTS = {
 		'IS_DEV': True,
 		'NO_PRETEND': False,
 		'VERBOSITY': 1,
-		
+
 		'quiet': False,
 		'nocolor': False,
 		'library': set(),
diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py
index a2c317e..e78748c 100644
--- a/pym/gentoolkit/revdep_rebuild/stuff.py
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py
@@ -14,7 +14,7 @@ import portage
 def call_program(args):
 	''' Calls program with specified parameters
 	and returns the stdout as a str object.
-	
+
 	@param, args: arument list to pass to subprocess
 	@return str
 	'''
@@ -45,7 +45,7 @@ def scan(params, files, max_args):
 
 def get_masking_status(ebuild):
 	"""returns the masking status of an ebuild
-	
+
 	@param ebuild: str
 	@return list
 	"""
diff --git a/pym/gentoolkit/test/eclean/distsupport.py b/pym/gentoolkit/test/eclean/distsupport.py
index 3a4b011..e9ab8a1 100644
--- a/pym/gentoolkit/test/eclean/distsupport.py
+++ b/pym/gentoolkit/test/eclean/distsupport.py
@@ -42,13 +42,13 @@ PROPS = {
 	'media-libs/sdl-pango-0.1.2': {
 		"SRC_URI": 'mirror://sourceforge/sdlpango/SDL_Pango-0.1.2.tar.gz http://zarb.org/~gc/t/SDL_Pango-0.1.2-API-adds.patch',
 		"RESTRICT": ''},
-	'x11-base/xorg-server-1.6.5-r1': { 
+	'x11-base/xorg-server-1.6.5-r1': {
 		"SRC_URI": 'http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.5.tar.bz2 mirror://gentoo/xorg-server-1.6.5-gentoo-patches-01.tar.bz2',
 		"RESTRICT": ''},
 	'perl-core/ExtUtils-ParseXS-2.20.0401': {
 		"SRC_URI": 'mirror://cpan/authors/id/D/DA/DAGOLDEN//ExtUtils-ParseXS-2.200401.tar.gz',
 		"RESTRICT": ''},
-	'x11-misc/util-macros-1.3.0': { 
+	'x11-misc/util-macros-1.3.0': {
 		"SRC_URI": 'http://xorg.freedesktop.org/releases/individual/util/util-macros-1.3.0.tar.bz2',
 		"RESTRICT": ''},
 	'x11-base/xorg-server-1.7.5': {
@@ -63,7 +63,7 @@ PROPS = {
 	'perl-core/Module-Build-0.35': {
 		"SRC_URI": 'mirror://cpan/authors/id/D/DA/DAGOLDEN//Module-Build-0.35.tar.gz',
 		"RESTRICT": ''},
-	'perl-core/ExtUtils-ParseXS-2.22.02': { 
+	'perl-core/ExtUtils-ParseXS-2.22.02': {
 		"SRC_URI": 'mirror://cpan/authors/id/D/DA/DAGOLDEN//ExtUtils-ParseXS-2.2202.tar.gz',
 		"RESTRICT": ''},
 	'perl-core/ExtUtils-ParseXS-2.22.03': {
@@ -78,10 +78,10 @@ PROPS = {
 	'perl-core/Archive-Tar-1.58': {
 		"SRC_URI": 'mirror://cpan/authors/id/B/BI/BINGOS//Archive-Tar-1.58.tar.gz',
 		"RESTRICT": ''},
-	'perl-core/Archive-Tar-1.54': { 
+	'perl-core/Archive-Tar-1.54': {
 		"SRC_URI": 'mirror://cpan/authors/id/B/BI/BINGOS//Archive-Tar-1.54.tar.gz',
 		"RESTRICT": ''},
-	'perl-core/Archive-Tar-1.56': { 
+	'perl-core/Archive-Tar-1.56': {
 		"SRC_URI": 'mirror://cpan/authors/id/B/BI/BINGOS//Archive-Tar-1.56.tar.gz',
 		"RESTRICT": ''},
 	'app-portage/portage-utils-0.2.1': {
@@ -96,7 +96,7 @@ PROPS = {
 	'x11-misc/util-macros-1.6.0': {
 		"SRC_URI": 'http://xorg.freedesktop.org/releases/individual/util/util-macros-1.6.0.tar.bz2',
 		"RESTRICT": ''},
-	'x11-libs/pixman-0.16.0': { 
+	'x11-libs/pixman-0.16.0': {
 		"SRC_URI": 'http://xorg.freedesktop.org/releases/individual/lib/pixman-0.16.0.tar.bz2',
 		"RESTRICT": ''},
 	'x11-libs/pixman-0.16.4': {
@@ -150,7 +150,7 @@ PROPS = {
 	'x11-base/xorg-server-1.7.5.901': {
 		"SRC_URI": 'http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.5.901.tar.bz2',
 		"RESTRICT": ''},
-	'dev-libs/libisofs-0.6.24': { 
+	'dev-libs/libisofs-0.6.24': {
 		"SRC_URI": 'http://files.libburnia-project.org/releases/libisofs-0.6.24.tar.gz',
 		"RESTRICT": ''},
 	'dev-libs/libisofs-0.6.26': {
@@ -159,13 +159,13 @@ PROPS = {
 	'app-portage/portage-utils-0.3.1': {
 		"SRC_URI": 'mirror://gentoo/portage-utils-0.3.1.tar.bz2',
 		"RESTRICT": ''},
-	'app-portage/gentoolkit-0.3.0_rc8-r1': { 
+	'app-portage/gentoolkit-0.3.0_rc8-r1': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.3.0_rc8.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.0_rc8.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/gentoolkit-0.2.4.6-r1': { 
+	'app-portage/gentoolkit-0.2.4.6-r1': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.2.4.6.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.2.4.6.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/eix-0.20.2': { 
+	'app-portage/eix-0.20.2': {
 		"SRC_URI": 'mirror://berlios/eix/eix-0.20.2.tar.xz',
 		"RESTRICT": ''},
 	'app-portage/gentoolkit-0.2.4.5': {
@@ -177,7 +177,7 @@ PROPS = {
 	'app-portage/gentoolkit-0.3.0_rc8': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.3.0_rc8.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.0_rc8.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/gentoolkit-0.2.4.6': { 
+	'app-portage/gentoolkit-0.2.4.6': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.2.4.6.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.2.4.6.tar.gz',
 		"RESTRICT": ''},
 	'app-portage/layman-1.3.0-r1': {
@@ -186,7 +186,7 @@ PROPS = {
 	'app-portage/gentoolkit-0.3.0_rc7': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.3.0_rc7.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.0_rc7.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/layman-1.3.0': { 
+	'app-portage/layman-1.3.0': {
 		"SRC_URI": 'mirror://sourceforge/layman/layman-1.3.0.tar.gz',
 		"RESTRICT": ''},
 	'app-portage/layman-1.3.1': {
@@ -198,16 +198,16 @@ PROPS = {
 	'app-portage/layman-9999': {
 		"SRC_URI": '',
 		"RESTRICT": ''},
-	'app-portage/layman-1.2.5': { 
+	'app-portage/layman-1.2.5': {
 		"SRC_URI": 'mirror://sourceforge/layman/layman-1.2.5.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/layman-1.3.0_rc1-r3': { 
+	'app-portage/layman-1.3.0_rc1-r3': {
 		"SRC_URI": 'mirror://sourceforge/layman/layman-1.3.0_rc1.tar.gz',
 		"RESTRICT": ''},
 	'app-portage/gentoolkit-0.3.0_rc9': {
 		"SRC_URI": 'mirror://gentoo/gentoolkit-0.3.0_rc9.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.0_rc9.tar.gz',
 		"RESTRICT": ''},
-	'app-portage/eix-0.20.1': { 
+	'app-portage/eix-0.20.1': {
 		"SRC_URI": 'mirror://sourceforge/eix/eix-0.20.1.tar.xz',
 		"RESTRICT": ''},
 	'app-portage/eix-0.19.2': {
@@ -254,22 +254,22 @@ CPVS2 = [
 	'app-portage/gentoolkit-0.3.0_rc9',
 	'app-portage/layman-1.2.5',
 	'app-portage/layman-1.2.6',
-	'app-portage/layman-1.3.0', 
+	'app-portage/layman-1.3.0',
 	'app-portage/layman-1.3.0-r1',
 	'app-portage/layman-1.3.0_rc1-r3',
-	'app-portage/layman-1.3.1', 
+	'app-portage/layman-1.3.1',
 	'app-portage/layman-1.3.2-r1',
 	'app-portage/layman-9999',
 	'app-portage/portage-utils-0.2.1',
-	'app-portage/portage-utils-0.3.1', 
+	'app-portage/portage-utils-0.3.1',
 	'dev-libs/libburn-0.6.8',
-	'dev-libs/libburn-0.7.0', 
+	'dev-libs/libburn-0.7.0',
 	'dev-libs/libburn-0.7.4',
 	'dev-libs/libburn-0.7.6-r1',
 	'dev-libs/libisofs-0.6.20-r1',
 	'dev-libs/libisofs-0.6.24',
-	'dev-libs/libisofs-0.6.26', 
-	'dev-libs/libisofs-0.6.28', 
+	'dev-libs/libisofs-0.6.26',
+	'dev-libs/libisofs-0.6.28',
 	'media-libs/sdl-pango-0.1.2',
 	'media-libs/xine-lib-1.1.17',
 	'media-libs/xine-lib-1.1.18',
@@ -279,9 +279,9 @@ CPVS2 = [
 	'perl-core/Archive-Tar-1.58',
 	'perl-core/ExtUtils-ParseXS-2.20.0401',
 	'perl-core/ExtUtils-ParseXS-2.21',
-	'perl-core/ExtUtils-ParseXS-2.22', 
-	'perl-core/ExtUtils-ParseXS-2.22.01', 
-	'perl-core/ExtUtils-ParseXS-2.22.02', 
+	'perl-core/ExtUtils-ParseXS-2.22',
+	'perl-core/ExtUtils-ParseXS-2.22.01',
+	'perl-core/ExtUtils-ParseXS-2.22.02',
 	'perl-core/ExtUtils-ParseXS-2.22.02-r1',
 	'perl-core/ExtUtils-ParseXS-2.22.03',
 	'perl-core/Module-Build-0.34.0201',
@@ -289,16 +289,16 @@ CPVS2 = [
 	'perl-core/Module-Build-0.36.01',
 	'perl-core/Module-Build-0.36.03',
 	'sys-apps/devicekit-power-014',
-	'sys-apps/help2man-1.37.1', 
+	'sys-apps/help2man-1.37.1',
 	'sys-auth/consolekit-0.4.1',
 	'x11-base/xorg-server-1.5.3-r6',
 	'x11-base/xorg-server-1.6.5-r1',
-	'x11-base/xorg-server-1.7.5', 
+	'x11-base/xorg-server-1.7.5',
 	'x11-base/xorg-server-1.7.5.901',
-	'x11-libs/pixman-0.16.0', 
+	'x11-libs/pixman-0.16.0',
 	'x11-libs/pixman-0.16.4',
 	'x11-libs/pixman-0.17.2',
-	'x11-libs/pixman-0.17.4', 
+	'x11-libs/pixman-0.17.4',
 	'x11-misc/util-macros-1.3.0',
 	'x11-misc/util-macros-1.5.0',
 	'x11-misc/util-macros-1.6.0'
@@ -335,7 +335,7 @@ Exclude= {'packages': {
 	'categories': {'app-portage': None,
 		'app-portage/gentoolkit': None
 		},
-	'filenames': {'sys-auth/consolekit-0.4.1': re.compile('sys-auth/consolekit-0.4.1')       
+	'filenames': {'sys-auth/consolekit-0.4.1': re.compile('sys-auth/consolekit-0.4.1')
 		}
 	}
 
diff --git a/pym/gentoolkit/test/eclean/test_clean.py b/pym/gentoolkit/test/eclean/test_clean.py
index 706b3d1..36b6281 100755
--- a/pym/gentoolkit/test/eclean/test_clean.py
+++ b/pym/gentoolkit/test/eclean/test_clean.py
@@ -26,7 +26,7 @@ from gentoolkit.eclean.clean import CleanUp
 class Controllers(object):
 	"""Contains controller methods for use in testing
 	the clean module methods"""
-	
+
 	def __init__(self):
 		self.gathered_data = []
 		self.authorize = True
@@ -35,7 +35,7 @@ class Controllers(object):
 
 	def authorize_all_controller(self, size, key, clean_list):
 		"""data gatherering controller.
-		
+
 		@rtype: Boolean
 		@returns: self.authorize which controls the cleaning method
 		"""
@@ -45,18 +45,18 @@ class Controllers(object):
 	def authorize_list_controller(self, size, key, clean_list):
 		"""data gathering and controller which
 		authorizes acoring to a pre-determined list
-		
+
 		@rtype: Boolean
 		@return self.authorize_list[self.authorize_index]"""
 		self.gathered_data.append([size, key, clean_list])
 		index = self.authorize_index
 		self.authorize_index =+ 1
 		return self.authorize_list[index]
-		
+
 
 #class TestCleanUp(unittest.TestCase):
 #	"""Test module for the various CleanUp class methods
-#	
+#
 #	@param options: dict of module options
 #	@param testdata: dict. of path and test parameters
 #			as created by the TestDirCreation class"""
@@ -64,7 +64,7 @@ class Controllers(object):
 #	def __init__(self, options, testdata):
 #		self.options = options
 #		self.tesdata = testdata
-#		
+#
 #
 #	def test_symlink_clean():
 #		"""Tests the symbolic link portion of the distfiles
@@ -88,7 +88,7 @@ class Controllers(object):
 #		clean = CleanUp(controller)
 #		clean.pretend_clean(self.dist_clean)
 #		data = controller.gathered_data
-		
+
 
 
 def useage():
@@ -114,7 +114,7 @@ def useage():
 
 def parse_opts():
 	"""Parse the options dict
-	
+
 	@return options: dictionary of module options"""
 	try:
 		opts, args = getopt(sys.argv[1:], 'acDkpPS', ["version",
@@ -131,10 +131,10 @@ def parse_opts():
 
 def main(cmdline=False):
 	"""parse options and run the tests"""
-	
+
 	if cmdline:
 		options = parse_opts()
-	
+
 
 if __name__ == "__main__":
 	"""actually call main() if launched as a script"""
diff --git a/pym/gentoolkit/test/test_helpers.py b/pym/gentoolkit/test/test_helpers.py
index 24aeedf..729f3dd 100644
--- a/pym/gentoolkit/test/test_helpers.py
+++ b/pym/gentoolkit/test/test_helpers.py
@@ -65,10 +65,10 @@ class TestFileOwner(unittest.TestCase):
 
 	def test_expand_abspaths(self):
 		expand_abspaths = helpers.FileOwner.expand_abspaths
-		
+
 		initial_file_list = ['foo0', '/foo1', '~/foo2', './foo3']
 		# This function should only effect foo3, and not ordering:
-		
+
 		final_file_list = [
 			'foo0',
 			'/foo1',