[PATCH 34/68] lib/portage/dep/__init__.py: fix whitespace

Aaron Bauman <[email protected]>
Newsgroups gmane.linux.gentoo.portage.devel
Message-ID <[email protected]>
Signed-off-by: Aaron Bauman <[email protected]>
---
 lib/portage/dep/__init__.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 36f0dc8c9..50266a21b 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -1,5 +1,5 @@
 # deps.py -- Portage dependency resolution functions
-# Copyright 2003-2018 Gentoo Foundation
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = [
@@ -9,7 +9,7 @@ __all__ = [
 	'get_operator', 'isjustname', 'isspecific',
 	'isvalidatom', 'match_from_list', 'match_to_list',
 	'paren_enclose', 'paren_normalize', 'paren_reduce',
-	'remove_slot', 'strip_empty', 'use_reduce', 
+	'remove_slot', 'strip_empty', 'use_reduce',
 	'_repo_separator', '_slot_separator',
 ]
 
@@ -93,7 +93,7 @@ def _get_atom_re(eapi_attrs):
 	atom_re = re.compile('^(?P<without_use>(?:' +
 		'(?P<op>' + _op + cpv_re + ')|' +
 		'(?P<star>=' + cpv_re + r'\*)|' +
-		'(?P<simple>' + cp_re + '))' + 
+		'(?P<simple>' + cp_re + '))' +
 		'(' + _slot_separator + _slot_loose + ')?' +
 		_repo + ')(' + _use + ')?$', re.VERBOSE | re.UNICODE)
 
@@ -281,7 +281,7 @@ def paren_reduce(mystr, _deprecation_warn=True):
 							stack[level].extend(l[0])
 						else:
 							stack[level].extend(l)
-					else:	
+					else:
 						stack[level].append(l)
 
 				if l:
@@ -322,13 +322,13 @@ def paren_reduce(mystr, _deprecation_warn=True):
 
 			if token[-1] == "?":
 				need_bracket = True
-			
+
 			stack[level].append(token)
 
 	if level != 0 or need_bracket:
 		raise InvalidDependString(
 			_("malformed syntax: '%s'") % mystr)
-	
+
 	return stack[0]
 
 class paren_normalize(list):
@@ -420,7 +420,7 @@ def _use_reduce_cached(depstr, uselist, masklist, matchall, excludeall, \
 		else:
 			flag = conditional[:-1]
 			is_negated = False
-		
+
 		if is_valid_flag:
 			if not is_valid_flag(flag):
 				msg = _("USE flag '%s' referenced in " + \
@@ -669,7 +669,7 @@ def _use_reduce_cached(depstr, uselist, masklist, matchall, excludeall, \
 				raise InvalidDependString(
 					_("SRC_URI arrow not allowed in EAPI %s: token %s") % (eapi, pos+1))
 			need_simple_token = True
-			stack[level].append(token)	
+			stack[level].append(token)
 		else:
 			if need_bracket:
 				raise InvalidDependString(
@@ -710,11 +710,11 @@ def _use_reduce_cached(depstr, uselist, masklist, matchall, excludeall, \
 	if level != 0:
 		raise InvalidDependString(
 			_("Missing '%s' at end of string") % (")",))
-	
+
 	if need_bracket:
 		raise InvalidDependString(
 			_("Missing '%s' at end of string") % ("(",))
-			
+
 	if need_simple_token:
 		raise InvalidDependString(
 			_("Missing file name at end of string"))
@@ -1054,7 +1054,7 @@ class _use_dep:
 		tokens = []
 
 		all_defaults = self.missing_enabled | self.missing_disabled
-		
+
 		def validate_flag(flag):
 			return is_valid_flag(flag) or flag in all_defaults
 
@@ -1823,7 +1823,7 @@ def dep_getslot(mydep):
 
 	#remove repo_name if present
 	mydep = mydep.split(_repo_separator)[0]
-	
+
 	colon = mydep.find(_slot_separator)
 	if colon != -1:
 		bracket = mydep.find("[", colon)
@@ -2249,7 +2249,7 @@ def match_from_list(mydep, candidate_list):
 
 	elif operator == "=*": # glob match
 		# XXX: Nasty special casing for leading zeros
-		# Required as =* is a literal prefix match, so can't 
+		# Required as =* is a literal prefix match, so can't
 		# use vercmp
 		myver = mycpv_cps[2].lstrip("0")
 		if not myver or not myver[0].isdigit():
@@ -2495,7 +2495,7 @@ def get_required_use_flags(required_use, eapi=None):
 				stack[level].append(token)
 			else:
 				stack[level].append(True)
-			
+
 			register_token(token)
 
 	if level != 0 or need_bracket:
@@ -2603,7 +2603,7 @@ def check_required_use(required_use, use, iuse_match, eapi=None):
 
 		return (flag in use and not is_negated) or \
 			(flag not in use and is_negated)
-	
+
 	def is_satisfied(operator, argument):
 		if not argument and eapi_attrs.empty_groups_always_true:
 			#|| ( ) -> True
@@ -2812,7 +2812,7 @@ def extract_affecting_use(mystr, atom, eapi=None):
 							stack[level].extend(l[0])
 						else:
 							stack[level].extend(l)
-					else:	
+					else:
 						stack[level].append(l)
 
 				if l:
-- 
2.28.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.