pym/util: clean up style a bit

Shouldn't be any functional changes here.

9 files changed, 93 insertions, 94 deletions

diff --git a/pym/portage/util/ExtractKernelVersion.py b/pym/portage/util/ExtractKernelVersion.py
index 69bd58a68..af4a4fe63 100644
--- a/pym/portage/util/ExtractKernelVersion.py
+++ b/pym/portage/util/ExtractKernelVersion.py
@@ -61,18 +61,18 @@ def ExtractKernelVersion(base_dir):
 
 	# Grab a list of files named localversion* and sort them
 	localversions = os.listdir(base_dir)
-	for x in range(len(localversions)-1,-1,-1):
+	for x in range(len(localversions) - 1, -1, -1):
 		if localversions[x][:12] != "localversion":
 			del localversions[x]
 	localversions.sort()
 
 	# Append the contents of each to the version string, stripping ALL whitespace
 	for lv in localversions:
-		version += "".join( " ".join( grabfile( base_dir+ "/" + lv ) ).split() )
+		version += "".join(" ".join(grabfile(base_dir + "/" + lv)).split())
 
 	# Check the .config for a CONFIG_LOCALVERSION and append that too, also stripping whitespace
 	kernelconfig = getconfig(base_dir+"/.config")
 	if kernelconfig and "CONFIG_LOCALVERSION" in kernelconfig:
 		version += "".join(kernelconfig["CONFIG_LOCALVERSION"].split())
 
-	return (version,None)
+	return (version, None)
diff --git a/pym/portage/util/SlotObject.py b/pym/portage/util/SlotObject.py
index a59dfc199..4bb682258 100644
--- a/pym/portage/util/SlotObject.py
+++ b/pym/portage/util/SlotObject.py
@@ -48,4 +48,3 @@ class SlotObject(object):
 				setattr(obj, myattr, getattr(self, myattr))
 
 		return obj
-
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index e94849f8a..24553dae4 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -64,7 +64,7 @@ def initialize_logger(level=logging.WARN):
 	"""
 	logging.basicConfig(level=logging.WARN, format='[%(levelname)-4s] %(message)s')
 
-def writemsg(mystr,noiselevel=0,fd=None):
+def writemsg(mystr, noiselevel=0, fd=None):
 	"""Prints out warning and debug messages based on the noiselimit setting"""
 	global noiselimit
 	if fd is None:
@@ -82,7 +82,7 @@ def writemsg(mystr,noiselevel=0,fd=None):
 		fd.write(mystr)
 		fd.flush()
 
-def writemsg_stdout(mystr,noiselevel=0):
+def writemsg_stdout(mystr, noiselevel=0):
 	"""Prints messages stdout based on the noiselimit setting"""
 	writemsg(mystr, noiselevel=noiselevel, fd=sys.stdout)
 
@@ -107,7 +107,7 @@ def writemsg_level(msg, level=0, noiselevel=0):
 	writemsg(msg, noiselevel=noiselevel, fd=fd)
 
 def normalize_path(mypath):
-	""" 
+	"""
 	os.path.normpath("//foo") returns "//foo" instead of "/foo"
 	We dislike this behavior so we create our own normpath func
 	to fix it.
@@ -127,8 +127,8 @@ def grabfile(myfilename, compat_level=0, recursive=0, remember_source_file=False
 	"""This function grabs the lines in a file, normalizes whitespace and returns lines in a list; if a line
 	begins with a #, it is ignored, as are empty lines"""
 
-	mylines=grablines(myfilename, recursive, remember_source_file=True)
-	newlines=[]
+	mylines = grablines(myfilename, recursive, remember_source_file=True)
+	newlines = []
 
 	for x, source_file in mylines:
 		#the split/join thing removes leading and trailing whitespace, and converts any whitespace in the line
@@ -146,10 +146,10 @@ def grabfile(myfilename, compat_level=0, recursive=0, remember_source_file=False
 		myline = " ".join(myline)
 		if not myline:
 			continue
-		if myline[0]=="#":
+		if myline[0] == "#":
 			# Check if we have a compat-level string. BC-integration data.
 			# '##COMPAT==>N<==' 'some string attached to it'
-			mylinetest = myline.split("<==",1)
+			mylinetest = myline.split("<==", 1)
 			if len(mylinetest) == 2:
 				myline_potential = mylinetest[1]
 				mylinetest = mylinetest[0].split("##COMPAT==>")
@@ -166,7 +166,7 @@ def grabfile(myfilename, compat_level=0, recursive=0, remember_source_file=False
 			newlines.append(myline)
 	return newlines
 
-def map_dictlist_vals(func,myDict):
+def map_dictlist_vals(func, myDict):
 	"""Performs a function on each value of each key in a dictlist.
 	Returns a new dictlist."""
 	new_dl = {}
@@ -180,7 +180,7 @@ def stack_dictlist(original_dicts, incremental=0, incrementals=[], ignore_none=0
 	Stacks an array of dict-types into one array. Optionally merging or
 	overwriting matching key/value pairs for the dict[key]->list.
 	Returns a single dict. Higher index in lists is preferenced.
-	
+
 	Example usage:
 	   >>> from portage.util import stack_dictlist
 		>>> print stack_dictlist( [{'a':'b'},{'x':'y'}])
@@ -195,7 +195,7 @@ def stack_dictlist(original_dicts, incremental=0, incrementals=[], ignore_none=0
 		>>> { 'KEYWORDS':['alpha'] }
 		>>> print stack_dictlist( [a,b], incrementals=['KEYWORDS'])
 		>>> { 'KEYWORDS':['alpha'] }
-	
+
 	@param original_dicts a list of (dictionary objects or None)
 	@type list
 	@param incremental True or false depending on whether new keys should overwrite
@@ -206,7 +206,7 @@ def stack_dictlist(original_dicts, incremental=0, incrementals=[], ignore_none=0
 	@type list
 	@param ignore_none Appears to be ignored, but probably was used long long ago.
 	@type boolean
-	
+
 	"""
 	final_dict = {}
 	for mydict in original_dicts:
@@ -215,7 +215,7 @@ def stack_dictlist(original_dicts, incremental=0, incrementals=[], ignore_none=0
 		for y in mydict:
 			if not y in final_dict:
 				final_dict[y] = []
-			
+
 			for thing in mydict[y]:
 				if thing:
 					if incremental or y in incrementals:
@@ -342,7 +342,7 @@ def stack_lists(lists, incremental=1, remember_source_file=False,
 def grabdict(myfilename, juststrings=0, empty=0, recursive=0, incremental=1):
 	"""
 	This function grabs the lines in a file, normalizes whitespace and returns lines in a dictionary
-	
+
 	@param myfilename: file to process
 	@type myfilename: string (path)
 	@param juststrings: only return strings
@@ -358,9 +358,9 @@ def grabdict(myfilename, juststrings=0, empty=0, recursive=0, incremental=1):
 	1.  Returns the lines in a file in a dictionary, for example:
 		'sys-apps/portage x86 amd64 ppc'
 		would return
-		{ "sys-apps/portage" : [ 'x86', 'amd64', 'ppc' ]
+		{"sys-apps/portage" : ['x86', 'amd64', 'ppc']}
 	"""
-	newdict={}
+	newdict = {}
 	for x in grablines(myfilename, recursive):
 		#the split/join thing removes leading and trailing whitespace, and converts any whitespace in the line
 		#into single spaces.
@@ -537,7 +537,7 @@ def _recursive_file_list(path):
 				yield fullpath
 
 def grablines(myfilename, recursive=0, remember_source_file=False):
-	mylines=[]
+	mylines = []
 	if recursive:
 		for f in _recursive_file_list(myfilename):
 			mylines.extend(grablines(f, recursive=False,
@@ -561,7 +561,7 @@ def grablines(myfilename, recursive=0, remember_source_file=False):
 				raise
 	return mylines
 
-def writedict(mydict,myfilename,writekey=True):
+def writedict(mydict, myfilename, writekey=True):
 	"""Writes out a dict to a file; writekey=0 mode doesn't write out
 	the key and assumes all values are strings, not lists."""
 	lines = []
@@ -769,10 +769,10 @@ def varexpand(mystring, mydict=None, error_leader=None):
 	This code is used by the configfile code, as well as others (parser)
 	This would be a good bunch of code to port to C.
 	"""
-	numvars=0
-	#in single, double quotes
-	insing=0
-	indoub=0
+	numvars = 0
+	# in single, double quotes
+	insing = 0
+	indoub = 0
 	pos = 0
 	length = len(mystring)
 	newstring = []
@@ -784,7 +784,7 @@ def varexpand(mystring, mydict=None, error_leader=None):
 			else:
 				newstring.append("'") # Quote removal is handled by shlex.
 				insing=not insing
-			pos=pos+1
+			pos += 1
 			continue
 		elif current == '"':
 			if (insing):
@@ -792,9 +792,9 @@ def varexpand(mystring, mydict=None, error_leader=None):
 			else:
 				newstring.append('"') # Quote removal is handled by shlex.
 				indoub=not indoub
-			pos=pos+1
+			pos += 1
 			continue
-		if (not insing): 
+		if not insing:
 			#expansion time
 			if current == "\n":
 				#convert newlines to spaces
@@ -809,7 +809,7 @@ def varexpand(mystring, mydict=None, error_leader=None):
 				# escaped newline characters. Note that we don't handle
 				# escaped quotes here, since getconfig() uses shlex
 				# to handle that earlier.
-				if (pos+1>=len(mystring)):
+				if pos + 1 >= len(mystring):
 					newstring.append(current)
 					break
 				else:
@@ -831,15 +831,15 @@ def varexpand(mystring, mydict=None, error_leader=None):
 						newstring.append(mystring[pos - 2:pos])
 					continue
 			elif current == "$":
-				pos=pos+1
-				if mystring[pos]=="{":
-					pos=pos+1
-					braced=True
+				pos += 1
+				if mystring[pos] == "{":
+					pos += 1
+					braced = True
 				else:
-					braced=False
-				myvstart=pos
+					braced = False
+				myvstart = pos
 				while mystring[pos] in _varexpand_word_chars:
-					if (pos+1)>=len(mystring):
+					if pos + 1 >= len(mystring):
 						if braced:
 							msg = _varexpand_unexpected_eof_msg
 							if error_leader is not None:
@@ -847,20 +847,20 @@ def varexpand(mystring, mydict=None, error_leader=None):
 							writemsg(msg + "\n", noiselevel=-1)
 							return ""
 						else:
-							pos=pos+1
+							pos += 1
 							break
-					pos=pos+1
-				myvarname=mystring[myvstart:pos]
+					pos += 1
+				myvarname = mystring[myvstart:pos]
 				if braced:
-					if mystring[pos]!="}":
+					if mystring[pos] != "}":
 						msg = _varexpand_unexpected_eof_msg
 						if error_leader is not None:
 							msg = error_leader() + msg
 						writemsg(msg + "\n", noiselevel=-1)
 						return ""
 					else:
-						pos=pos+1
-				if len(myvarname)==0:
+						pos += 1
+				if len(myvarname) == 0:
 					msg = "$"
 					if braced:
 						msg += "{}"
@@ -869,7 +869,7 @@ def varexpand(mystring, mydict=None, error_leader=None):
 						msg = error_leader() + msg
 					writemsg(msg + "\n", noiselevel=-1)
 					return ""
-				numvars=numvars+1
+				numvars += 1
 				if myvarname in mydict:
 					newstring.append(mydict[myvarname])
 			else:
@@ -884,9 +884,9 @@ def varexpand(mystring, mydict=None, error_leader=None):
 # broken and removed, but can still be imported
 pickle_write = None
 
-def pickle_read(filename,default=None,debug=0):
+def pickle_read(filename, default=None, debug=0):
 	if not os.access(filename, os.R_OK):
-		writemsg(_("pickle_read(): File not readable. '")+filename+"'\n",1)
+		writemsg(_("pickle_read(): File not readable. '") + filename + "'\n", 1)
 		return default
 	data = None
 	try:
@@ -895,12 +895,12 @@ def pickle_read(filename,default=None,debug=0):
 		mypickle = pickle.Unpickler(myf)
 		data = mypickle.load()
 		myf.close()
-		del mypickle,myf
-		writemsg(_("pickle_read(): Loaded pickle. '")+filename+"'\n",1)
+		del mypickle, myf
+		writemsg(_("pickle_read(): Loaded pickle. '") + filename + "'\n", 1)
 	except SystemExit as e:
 		raise
 	except Exception as e:
-		writemsg(_("!!! Failed to load pickle: ")+str(e)+"\n",1)
+		writemsg(_("!!! Failed to load pickle: ") + str(e) + "\n", 1)
 		data = default
 	return data
 
@@ -1681,9 +1681,9 @@ def find_updated_config_files(target_root, config_protect):
 	"""
 	Return a tuple of configuration files that needs to be updated.
 	The tuple contains lists organized like this:
-	[ protected_dir, file_list ]
+		[protected_dir, file_list]
 	If the protected config isn't a protected_dir but a procted_file, list is:
-	[ protected_file, None ]
+		[protected_file, None]
 	If no configuration files needs to be updated, None is returned
 	"""
 
diff --git a/pym/portage/util/_info_files.py b/pym/portage/util/_info_files.py
index 0e3a21027..fabf74b0f 100644
--- a/pym/portage/util/_info_files.py
+++ b/pym/portage/util/_info_files.py
@@ -14,9 +14,9 @@ def chk_updated_info_files(root, infodirs, prev_mtimes):
 
 	if os.path.exists("/usr/bin/install-info"):
 		out = portage.output.EOutput()
-		regen_infodirs=[]
+		regen_infodirs = []
 		for z in infodirs:
-			if z=='':
+			if z == '':
 				continue
 			inforoot = portage.util.normalize_path(root + z)
 			if os.path.isdir(inforoot) and \
@@ -37,11 +37,11 @@ def chk_updated_info_files(root, infodirs, prev_mtimes):
 				out.einfo("Regenerating GNU info directory index...")
 
 			dir_extensions = ("", ".gz", ".bz2")
-			icount=0
-			badcount=0
+			icount = 0
+			badcount = 0
 			errmsg = ""
 			for inforoot in regen_infodirs:
-				if inforoot=='':
+				if inforoot == '':
 					continue
 
 				if not os.path.isdir(inforoot) or \
@@ -89,20 +89,20 @@ def chk_updated_info_files(root, infodirs, prev_mtimes):
 						myso = portage._unicode_decode(
 							proc.communicate()[0]).rstrip("\n")
 						proc.wait()
-					existsstr="already exists, for file `"
+					existsstr = "already exists, for file `"
 					if myso:
-						if re.search(existsstr,myso):
+						if re.search(existsstr, myso):
 							# Already exists... Don't increment the count for this.
 							pass
-						elif myso[:44]=="install-info: warning: no info dir entry in ":
+						elif myso[:44] == "install-info: warning: no info dir entry in ":
 							# This info file doesn't contain a DIR-header: install-info produces this
 							# (harmless) warning (the --quiet switch doesn't seem to work).
 							# Don't increment the count for this.
 							pass
 						else:
-							badcount=badcount+1
+							badcount += 1
 							errmsg += myso + "\n"
-					icount=icount+1
+					icount += 1
 
 				if moved_old_dir and not os.path.exists(dir_file):
 					# We didn't generate a new dir file, so put the old file
diff --git a/pym/portage/util/_urlopen.py b/pym/portage/util/_urlopen.py
index 768ccb8a4..15f041a3a 100644
--- a/pym/portage/util/_urlopen.py
+++ b/pym/portage/util/_urlopen.py
@@ -23,7 +23,7 @@ if sys.hexversion >= 0x3000000:
 
 # to account for the difference between TIMESTAMP of the index' contents
 #  and the file-'mtime'
-TIMESTAMP_TOLERANCE=5
+TIMESTAMP_TOLERANCE = 5
 
 def urlopen(url, if_modified_since=None):
 	parse_result = urllib_parse.urlparse(url)
diff --git a/pym/portage/util/digraph.py b/pym/portage/util/digraph.py
index f752e28a8..fc1fb8646 100644
--- a/pym/portage/util/digraph.py
+++ b/pym/portage/util/digraph.py
@@ -17,24 +17,24 @@ class digraph(object):
 
 	def __init__(self):
 		"""Create an empty digraph"""
-		
+
 		# { node : ( { child : priority } , { parent : priority } ) }
 		self.nodes = {}
 		self.order = []
 
 	def add(self, node, parent, priority=0):
 		"""Adds the specified node with the specified parent.
-		
+
 		If the dep is a soft-dep and the node already has a hard
 		relationship to the parent, the relationship is left as hard."""
-		
+
 		if node not in self.nodes:
 			self.nodes[node] = ({}, {}, node)
 			self.order.append(node)
-		
+
 		if not parent:
 			return
-		
+
 		if parent not in self.nodes:
 			self.nodes[parent] = ({}, {}, parent)
 			self.order.append(parent)
@@ -51,15 +51,15 @@ class digraph(object):
 		"""Removes the specified node from the digraph, also removing
 		and ties to other nodes in the digraph. Raises KeyError if the
 		node doesn't exist."""
-		
+
 		if node not in self.nodes:
 			raise KeyError(node)
-		
+
 		for parent in self.nodes[node][1]:
 			del self.nodes[parent][0][node]
 		for child in self.nodes[node][0]:
 			del self.nodes[child][1][node]
-		
+
 		del self.nodes[node]
 		self.order.remove(node)
 
@@ -158,10 +158,10 @@ class digraph(object):
 
 	def leaf_nodes(self, ignore_priority=None):
 		"""Return all nodes that have no children
-		
+
 		If ignore_soft_deps is True, soft deps are not counted as
 		children in calculations."""
-		
+
 		leaf_nodes = []
 		if ignore_priority is None:
 			for node in self.order:
@@ -192,10 +192,10 @@ class digraph(object):
 
 	def root_nodes(self, ignore_priority=None):
 		"""Return all nodes that have no parents.
-		
+
 		If ignore_soft_deps is True, soft deps are not counted as
 		parents in calculations."""
-		
+
 		root_nodes = []
 		if ignore_priority is None:
 			for node in self.order:
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index e9c06c5d0..5fddaac31 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -171,9 +171,9 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 		myld = io.open(_unicode_encode(ldsoconf_path,
 			encoding=_encodings['fs'], errors='strict'),
 			mode='r', encoding=_encodings['content'], errors='replace')
-		myldlines=myld.readlines()
+		myldlines = myld.readlines()
 		myld.close()
-		oldld=[]
+		oldld = []
 		for x in myldlines:
 			#each line has at least one char (a newline)
 			if x[:1] == "#":
@@ -321,7 +321,7 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 			writemsg_level(_(">>> Regenerating %setc/ld.so.cache...\n") % \
 				(target_root,))
 			os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root))
-		elif ostype in ("FreeBSD","DragonFly"):
+		elif ostype in ("FreeBSD", "DragonFly"):
 			writemsg_level(_(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % \
 				target_root)
 			os.system(("cd / ; %s -elf -i " + \
@@ -340,7 +340,7 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 	outfile = atomic_ofstream(os.path.join(eroot, "etc", "profile.env"))
 	outfile.write(penvnotice)
 
-	env_keys = [ x for x in env if x != "LDPATH" ]
+	env_keys = [x for x in env if x != "LDPATH"]
 	env_keys.sort()
 	for k in env_keys:
 		v = env[k]
diff --git a/pym/portage/util/lafilefixer.py b/pym/portage/util/lafilefixer.py
index 54ff20de5..2562d9a77 100644
--- a/pym/portage/util/lafilefixer.py
+++ b/pym/portage/util/lafilefixer.py
@@ -11,7 +11,7 @@ from portage.exception import InvalidData
 #	This an re-implementaion of dev-util/lafilefixer-0.5.
 #	rewrite_lafile() takes the contents of an lafile as a string
 #	It then parses the dependency_libs and inherited_linker_flags
-#	entries. 
+#	entries.
 #	We insist on dependency_libs being present. inherited_linker_flags
 #	is optional.
 #	There are strict rules about the syntax imposed by libtool's libltdl.
@@ -21,7 +21,7 @@ from portage.exception import InvalidData
 #	lafilefixer does).
 #	What it does:
 #		* Replaces all .la files with absolut paths in dependency_libs with
-#		  corresponding -l* and -L* entries 
+#		  corresponding -l* and -L* entries
 #		  (/usr/lib64/libfoo.la -> -L/usr/lib64 -lfoo)
 #		* Moves various flags (see flag_re below) to inherited_linker_flags,
 #		  if such an entry was present.
@@ -36,7 +36,7 @@ from portage.exception import InvalidData
 dep_libs_re = re.compile(b"dependency_libs='(?P<value>[^']*)'$")
 inh_link_flags_re = re.compile(b"inherited_linker_flags='(?P<value>[^']*)'$")
 
-#regexes for replacing stuff in -L entries. 
+#regexes for replacing stuff in -L entries.
 #replace 'X11R6/lib' and 'local/lib' with 'lib', no idea what's this about.
 X11_local_sub = re.compile(b"X11R6/lib|local/lib")
 #get rid of the '..'
@@ -129,11 +129,11 @@ def rewrite_lafile(contents):
 			#This allows us to place all -L entries at the beginning
 			#of 'dependency_libs'.
 			ladir = dep_libs_entry
-			
+
 			ladir = X11_local_sub.sub(b"lib", ladir)
 			ladir = pkgconfig_sub1.sub(b"usr", ladir)
 			ladir = pkgconfig_sub2.sub(b"\g<usrlib>", ladir)
-			
+
 			if ladir not in libladir:
 				libladir.append(ladir)
 
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index e9b01be22..65d81c6bb 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -16,7 +16,7 @@ import textwrap
 
 import portage
 from portage import bsd_chflags, _encodings, _os_overrides, _selinux, \
-	_unicode_decode, _unicode_encode, _unicode_func_wrapper,\
+	_unicode_decode, _unicode_encode, _unicode_func_wrapper, \
 	_unicode_module_wrapper
 from portage.const import MOVE_BINARY
 from portage.exception import OperationNotSupported
@@ -181,7 +181,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 
 	try:
 		if not sstat:
-			sstat=os.lstat(src)
+			sstat = os.lstat(src)
 
 	except SystemExit as e:
 		raise
@@ -191,12 +191,12 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 		writemsg("!!! %s\n" % (e,), noiselevel=-1)
 		return None
 
-	destexists=1
+	destexists = 1
 	try:
-		dstat=os.lstat(dest)
+		dstat = os.lstat(dest)
 	except (OSError, IOError):
-		dstat=os.lstat(os.path.dirname(dest))
-		destexists=0
+		dstat = os.lstat(os.path.dirname(dest))
+		destexists = 0
 
 	if bsd_chflags:
 		if destexists and dstat.st_flags != 0:
@@ -211,7 +211,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 		if stat.S_ISLNK(dstat[stat.ST_MODE]):
 			try:
 				os.unlink(dest)
-				destexists=0
+				destexists = 0
 			except SystemExit as e:
 				raise
 			except Exception as e:
@@ -219,7 +219,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 
 	if stat.S_ISLNK(sstat[stat.ST_MODE]):
 		try:
-			target=os.readlink(src)
+			target = os.readlink(src)
 			if mysettings and "D" in mysettings and \
 				target.startswith(mysettings["D"]):
 				target = target[len(mysettings["D"])-1:]
@@ -238,7 +238,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 				if e.errno not in (errno.ENOENT, errno.EEXIST) or \
 					target != os.readlink(dest):
 					raise
-			lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+			lchown(dest, sstat[stat.ST_UID], sstat[stat.ST_GID])
 
 			try:
 				_os.unlink(src_bytes)
@@ -304,7 +304,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 					pass
 				break
 
-	renamefailed=1
+	renamefailed = 1
 	if hardlinked:
 		renamefailed = False
 	if not hardlinked and (selinux_enabled or sstat.st_dev == dstat.st_dev):
@@ -312,8 +312,8 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 			if selinux_enabled:
 				selinux.rename(src, dest)
 			else:
-				os.rename(src,dest)
-			renamefailed=0
+				os.rename(src, dest)
+			renamefailed = 0
 		except OSError as e:
 			if e.errno != errno.EXDEV:
 				# Some random error.