From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-443257-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SD69Y-0004TZ-GP
	for garchives@archives.gentoo.org; Thu, 29 Mar 2012 03:36:01 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EE67DE0D41;
	Thu, 29 Mar 2012 03:35:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id A6D85E0D41
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Mar 2012 03:35:41 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A87221B400F
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Mar 2012 03:35:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 41079E5402
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Mar 2012 03:35:39 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1332991960.b8a5d5d288b6d4138ee81f4c24692bdcb5c2c189.vapier@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/portage/xpak.py
X-VCS-Directories: pym/portage/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: b8a5d5d288b6d4138ee81f4c24692bdcb5c2c189
X-VCS-Branch: master
Date: Thu, 29 Mar 2012 03:35:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 77659858-5ce7-401b-9a64-c8e310c3b9a5
X-Archives-Hash: c4a265cf1ee38d84aeaf9feda695be74

commit:     b8a5d5d288b6d4138ee81f4c24692bdcb5c2c189
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 20:38:18 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 03:32:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Db8a5d5d2

xpak: clean up style

A few spaces here and there go a long way to making this readable.

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

---
 pym/portage/xpak.py |  247 +++++++++++++++++++++++++--------------------=
------
 1 files changed, 123 insertions(+), 124 deletions(-)

diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index db2a2bc..8689737 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -62,12 +62,12 @@ def encodeint(myint):
 	"""Takes a 4 byte integer and converts it into a string of 4 characters=
.
 	Returns the characters in a string."""
 	a =3D array.array('B')
-	a.append((myint >> 24 ) & 0xff)
-	a.append((myint >> 16 ) & 0xff)
-	a.append((myint >> 8 ) & 0xff)
+	a.append((myint >> 24) & 0xff)
+	a.append((myint >> 16) & 0xff)
+	a.append((myint >>  8) & 0xff)
 	a.append(myint & 0xff)
 	try:
-		# Python >=3D3.2
+		# Python >=3D 3.2
 		return a.tobytes()
 	except AttributeError:
 		return a.tostring()
@@ -84,12 +84,12 @@ def decodeint(mystring):
 	myint +=3D mystring[0] << 24
 	return myint
=20
-def xpak(rootdir,outfile=3DNone):
-	"""(rootdir,outfile) -- creates an xpak segment of the directory 'rootd=
ir'
+def xpak(rootdir, outfile=3DNone):
+	"""(rootdir, outfile) -- creates an xpak segment of the directory 'root=
dir'
 	and under the name 'outfile' if it is specified. Otherwise it returns t=
he
 	xpak segment."""
=20
-	mylist=3D[]
+	mylist =3D []
=20
 	addtolist(mylist, rootdir)
 	mylist.sort()
@@ -125,21 +125,21 @@ def xpak_mem(mydata):
 	del mydata_encoded
=20
 	indexglob =3D b''
-	indexpos=3D0
+	indexpos =3D 0
 	dataglob =3D b''
-	datapos=3D0
+	datapos =3D 0
 	for x, newglob in mydata.items():
-		mydatasize=3Dlen(newglob)
-		indexglob=3Dindexglob+encodeint(len(x))+x+encodeint(datapos)+encodeint=
(mydatasize)
-		indexpos=3Dindexpos+4+len(x)+4+4
-		dataglob=3Ddataglob+newglob
-		datapos=3Ddatapos+mydatasize
+		mydatasize =3D len(newglob)
+		indexglob =3D indexglob + encodeint(len(x)) + x + encodeint(datapos) +=
 encodeint(mydatasize)
+		indexpos =3D indexpos + 4 + len(x) + 4 + 4
+		dataglob =3D dataglob + newglob
+		datapos =3D datapos + mydatasize
 	return b'XPAKPACK' \
-	+ encodeint(len(indexglob)) \
-	+ encodeint(len(dataglob)) \
-	+ indexglob \
-	+ dataglob \
-	+ b'XPAKSTOP'
+		+ encodeint(len(indexglob)) \
+		+ encodeint(len(dataglob)) \
+		+ indexglob \
+		+ dataglob \
+		+ b'XPAKSTOP'
=20
 def xsplit(infile):
 	"""(infile) -- Splits the infile into two files.
@@ -149,7 +149,7 @@ def xsplit(infile):
 		encoding=3D_encodings['fs'], errors=3D'strict')
 	myfile =3D open(_unicode_encode(infile,
 		encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
-	mydat=3Dmyfile.read()
+	mydat =3D myfile.read()
 	myfile.close()
 =09
 	splits =3D xsplit_mem(mydat)
@@ -171,35 +171,35 @@ def xsplit_mem(mydat):
 		return None
 	if mydat[-8:] !=3D b'XPAKSTOP':
 		return None
-	indexsize=3Ddecodeint(mydat[8:12])
-	return (mydat[16:indexsize+16], mydat[indexsize+16:-8])
+	indexsize =3D decodeint(mydat[8:12])
+	return (mydat[16:indexsize + 16], mydat[indexsize + 16:-8])
=20
 def getindex(infile):
 	"""(infile) -- grabs the index segment from the infile and returns it."=
""
 	myfile =3D open(_unicode_encode(infile,
 		encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
-	myheader=3Dmyfile.read(16)
+	myheader =3D myfile.read(16)
 	if myheader[0:8] !=3D b'XPAKPACK':
 		myfile.close()
 		return
-	indexsize=3Ddecodeint(myheader[8:12])
-	myindex=3Dmyfile.read(indexsize)
+	indexsize =3D decodeint(myheader[8:12])
+	myindex =3D myfile.read(indexsize)
 	myfile.close()
 	return myindex
=20
 def getboth(infile):
 	"""(infile) -- grabs the index and data segments from the infile.
-	Returns an array [indexSegment,dataSegment]"""
+	Returns an array [indexSegment, dataSegment]"""
 	myfile =3D open(_unicode_encode(infile,
 		encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
-	myheader=3Dmyfile.read(16)
+	myheader =3D myfile.read(16)
 	if myheader[0:8] !=3D b'XPAKPACK':
 		myfile.close()
 		return
-	indexsize=3Ddecodeint(myheader[8:12])
-	datasize=3Ddecodeint(myheader[12:16])
-	myindex=3Dmyfile.read(indexsize)
-	mydata=3Dmyfile.read(datasize)
+	indexsize =3D decodeint(myheader[8:12])
+	datasize =3D decodeint(myheader[12:16])
+	myindex =3D myfile.read(indexsize)
+	mydata =3D myfile.read(datasize)
 	myfile.close()
 	return myindex, mydata
=20
@@ -210,52 +210,52 @@ def listindex(myindex):
=20
 def getindex_mem(myindex):
 	"""Returns the filenames listed in the indexglob passed in."""
-	myindexlen=3Dlen(myindex)
-	startpos=3D0
-	myret=3D[]
-	while ((startpos+8)<myindexlen):
-		mytestlen=3Ddecodeint(myindex[startpos:startpos+4])
-		myret=3Dmyret+[myindex[startpos+4:startpos+4+mytestlen]]
-		startpos=3Dstartpos+mytestlen+12
+	myindexlen =3D len(myindex)
+	startpos =3D 0
+	myret =3D []
+	while ((startpos + 8) < myindexlen):
+		mytestlen =3D decodeint(myindex[startpos:startpos + 4])
+		myret =3D myret + [myindex[startpos + 4:startpos + 4 + mytestlen]]
+		startpos =3D startpos + mytestlen + 12
 	return myret
=20
-def searchindex(myindex,myitem):
-	"""(index,item) -- Finds the offset and length of the file 'item' in th=
e
+def searchindex(myindex, myitem):
+	"""(index, item) -- Finds the offset and length of the file 'item' in t=
he
 	datasegment via the index 'index' provided."""
 	myitem =3D _unicode_encode(myitem,
 		encoding=3D_encodings['repo.content'], errors=3D'backslashreplace')
-	mylen=3Dlen(myitem)
-	myindexlen=3Dlen(myindex)
-	startpos=3D0
-	while ((startpos+8)<myindexlen):
-		mytestlen=3Ddecodeint(myindex[startpos:startpos+4])
-		if mytestlen=3D=3Dmylen:
-			if myitem=3D=3Dmyindex[startpos+4:startpos+4+mytestlen]:
+	mylen =3D len(myitem)
+	myindexlen =3D len(myindex)
+	startpos =3D 0
+	while ((startpos + 8) < myindexlen):
+		mytestlen =3D decodeint(myindex[startpos:startpos + 4])
+		if mytestlen =3D=3D mylen:
+			if myitem =3D=3D myindex[startpos + 4:startpos + 4 + mytestlen]:
 				#found
-				datapos=3Ddecodeint(myindex[startpos+4+mytestlen:startpos+8+mytestle=
n]);
-				datalen=3Ddecodeint(myindex[startpos+8+mytestlen:startpos+12+mytestl=
en]);
+				datapos =3D decodeint(myindex[startpos + 4 + mytestlen:startpos + 8 =
+ mytestlen])
+				datalen =3D decodeint(myindex[startpos + 8 + mytestlen:startpos + 12=
 + mytestlen])
 				return datapos, datalen
-		startpos=3Dstartpos+mytestlen+12
+		startpos =3D startpos + mytestlen + 12
 	=09
-def getitem(myid,myitem):
-	myindex=3Dmyid[0]
-	mydata=3Dmyid[1]
-	myloc=3Dsearchindex(myindex,myitem)
+def getitem(myid, myitem):
+	myindex =3D myid[0]
+	mydata =3D myid[1]
+	myloc =3D searchindex(myindex, myitem)
 	if not myloc:
 		return None
-	return mydata[myloc[0]:myloc[0]+myloc[1]]
+	return mydata[myloc[0]:myloc[0] + myloc[1]]
=20
-def xpand(myid,mydest):
+def xpand(myid, mydest):
 	mydest =3D normalize_path(mydest) + os.sep
-	myindex=3Dmyid[0]
-	mydata=3Dmyid[1]
-	myindexlen=3Dlen(myindex)
-	startpos=3D0
-	while ((startpos+8)<myindexlen):
-		namelen=3Ddecodeint(myindex[startpos:startpos+4])
-		datapos=3Ddecodeint(myindex[startpos+4+namelen:startpos+8+namelen]);
-		datalen=3Ddecodeint(myindex[startpos+8+namelen:startpos+12+namelen]);
-		myname=3Dmyindex[startpos+4:startpos+4+namelen]
+	myindex =3D myid[0]
+	mydata =3D myid[1]
+	myindexlen =3D len(myindex)
+	startpos =3D 0
+	while ((startpos + 8) < myindexlen):
+		namelen =3D decodeint(myindex[startpos:startpos + 4])
+		datapos =3D decodeint(myindex[startpos + 4 + namelen:startpos + 8 + na=
melen])
+		datalen =3D decodeint(myindex[startpos + 8 + namelen:startpos + 12 + n=
amelen])
+		myname =3D myindex[startpos + 4:startpos + 4 + namelen]
 		myname =3D _unicode_decode(myname,
 			encoding=3D_encodings['repo.content'], errors=3D'replace')
 		filename =3D os.path.join(mydest, myname.lstrip(os.sep))
@@ -269,23 +269,23 @@ def xpand(myid,mydest):
 				os.makedirs(dirname)
 		mydat =3D open(_unicode_encode(filename,
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'wb')
-		mydat.write(mydata[datapos:datapos+datalen])
+		mydat.write(mydata[datapos:datapos + datalen])
 		mydat.close()
-		startpos=3Dstartpos+namelen+12
+		startpos =3D startpos + namelen + 12
=20
 class tbz2(object):
-	def __init__(self,myfile):
-		self.file=3Dmyfile
-		self.filestat=3DNone
+	def __init__(self, myfile):
+		self.file =3D myfile
+		self.filestat =3D None
 		self.index =3D b''
-		self.infosize=3D0
-		self.xpaksize=3D0
-		self.indexsize=3DNone
-		self.datasize=3DNone
-		self.indexpos=3DNone
-		self.datapos=3DNone
-
-	def decompose(self,datadir,cleanup=3D1):
+		self.infosize =3D 0
+		self.xpaksize =3D 0
+		self.indexsize =3D None
+		self.datasize =3D None
+		self.indexpos =3D None
+		self.datapos =3D None
+
+	def decompose(self, datadir, cleanup=3D1):
 		"""Alias for unpackinfo() --- Complement to recompose() but optionally
 		deletes the destination directory. Extracts the xpak from the tbz2 int=
o
 		the directory provided. Raises IOError if scan() fails.
@@ -297,9 +297,9 @@ class tbz2(object):
 		if not os.path.exists(datadir):
 			os.makedirs(datadir)
 		return self.unpackinfo(datadir)
-	def compose(self,datadir,cleanup=3D0):
+	def compose(self, datadir, cleanup=3D0):
 		"""Alias for recompose()."""
-		return self.recompose(datadir,cleanup)
+		return self.recompose(datadir, cleanup)
=20
 	def recompose(self, datadir, cleanup=3D0, break_hardlinks=3DTrue):
 		"""Creates an xpak segment from the datadir provided, truncates the tb=
z2
@@ -337,9 +337,9 @@ class tbz2(object):
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'ab+')
 		if not myfile:
 			raise IOError
-		myfile.seek(-self.xpaksize,2) # 0,2 or -0,2 just mean EOF.
+		myfile.seek(-self.xpaksize, 2) # 0,2 or -0,2 just mean EOF.
 		myfile.truncate()
-		myfile.write(xpdata+encodeint(len(xpdata)) + b'STOP')
+		myfile.write(xpdata + encodeint(len(xpdata)) + b'STOP')
 		myfile.flush()
 		myfile.close()
 		return 1
@@ -361,40 +361,40 @@ class tbz2(object):
 		"""Scans the tbz2 to locate the xpak segment and setup internal values=
.
 		This function is called by relevant functions already."""
 		try:
-			mystat=3Dos.stat(self.file)
+			mystat =3D os.stat(self.file)
 			if self.filestat:
-				changed=3D0
+				changed =3D 0
 				if mystat.st_size !=3D self.filestat.st_size \
 					or mystat.st_mtime !=3D self.filestat.st_mtime \
 					or mystat.st_ctime !=3D self.filestat.st_ctime:
 					changed =3D True
 				if not changed:
 					return 1
-			self.filestat=3Dmystat
+			self.filestat =3D mystat
 			a =3D open(_unicode_encode(self.file,
 				encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
-			a.seek(-16,2)
-			trailer=3Da.read()
-			self.infosize=3D0
-			self.xpaksize=3D0
+			a.seek(-16, 2)
+			trailer =3D a.read()
+			self.infosize =3D 0
+			self.xpaksize =3D 0
 			if trailer[-4:] !=3D b'STOP':
 				a.close()
 				return 0
 			if trailer[0:8] !=3D b'XPAKSTOP':
 				a.close()
 				return 0
-			self.infosize=3Ddecodeint(trailer[8:12])
-			self.xpaksize=3Dself.infosize+8
-			a.seek(-(self.xpaksize),2)
-			header=3Da.read(16)
+			self.infosize =3D decodeint(trailer[8:12])
+			self.xpaksize =3D self.infosize + 8
+			a.seek(-(self.xpaksize), 2)
+			header =3D a.read(16)
 			if header[0:8] !=3D b'XPAKPACK':
 				a.close()
 				return 0
-			self.indexsize=3Ddecodeint(header[8:12])
-			self.datasize=3Ddecodeint(header[12:16])
-			self.indexpos=3Da.tell()
-			self.index=3Da.read(self.indexsize)
-			self.datapos=3Da.tell()
+			self.indexsize =3D decodeint(header[8:12])
+			self.datasize =3D decodeint(header[12:16])
+			self.indexpos =3D a.tell()
+			self.index =3D a.read(self.indexsize)
+			self.datapos =3D a.tell()
 			a.close()
 			return 2
 		except SystemExit:
@@ -408,28 +408,28 @@ class tbz2(object):
 			return None
 		return getindex_mem(self.index)
=20
-	def getfile(self,myfile,mydefault=3DNone):
+	def getfile(self, myfile, mydefault=3DNone):
 		"""Finds 'myfile' in the data segment and returns it."""
 		if not self.scan():
 			return None
-		myresult=3Dsearchindex(self.index,myfile)
+		myresult =3D searchindex(self.index, myfile)
 		if not myresult:
 			return mydefault
 		a =3D open(_unicode_encode(self.file,
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
-		a.seek(self.datapos+myresult[0],0)
-		myreturn=3Da.read(myresult[1])
+		a.seek(self.datapos + myresult[0], 0)
+		myreturn =3D a.read(myresult[1])
 		a.close()
 		return myreturn
=20
-	def getelements(self,myfile):
+	def getelements(self, myfile):
 		"""A split/array representation of tbz2.getfile()"""
-		mydat=3Dself.getfile(myfile)
+		mydat =3D self.getfile(myfile)
 		if not mydat:
 			return []
 		return mydat.split()
=20
-	def unpackinfo(self,mydest):
+	def unpackinfo(self, mydest):
 		"""Unpacks all the files from the dataSegment into 'mydest'."""
 		if not self.scan():
 			return 0
@@ -438,12 +438,12 @@ class tbz2(object):
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
 		if not os.path.exists(mydest):
 			os.makedirs(mydest)
-		startpos=3D0
-		while ((startpos+8)<self.indexsize):
-			namelen=3Ddecodeint(self.index[startpos:startpos+4])
-			datapos=3Ddecodeint(self.index[startpos+4+namelen:startpos+8+namelen]=
);
-			datalen=3Ddecodeint(self.index[startpos+8+namelen:startpos+12+namelen=
]);
-			myname=3Dself.index[startpos+4:startpos+4+namelen]
+		startpos =3D 0
+		while ((startpos + 8) < self.indexsize):
+			namelen =3D decodeint(self.index[startpos:startpos + 4])
+			datapos =3D decodeint(self.index[startpos + 4 + namelen:startpos + 8 =
+ namelen])
+			datalen =3D decodeint(self.index[startpos + 8 + namelen:startpos + 12=
 + namelen])
+			myname =3D self.index[startpos + 4:startpos + 4 + namelen]
 			myname =3D _unicode_decode(myname,
 				encoding=3D_encodings['repo.content'], errors=3D'replace')
 			filename =3D os.path.join(mydest, myname.lstrip(os.sep))
@@ -457,10 +457,10 @@ class tbz2(object):
 					os.makedirs(dirname)
 			mydat =3D open(_unicode_encode(filename,
 				encoding=3D_encodings['fs'], errors=3D'strict'), 'wb')
-			a.seek(self.datapos+datapos)
+			a.seek(self.datapos + datapos)
 			mydat.write(a.read(datalen))
 			mydat.close()
-			startpos=3Dstartpos+namelen+12
+			startpos =3D startpos + namelen + 12
 		a.close()
 		return 1
=20
@@ -471,28 +471,27 @@ class tbz2(object):
 		a =3D open(_unicode_encode(self.file,
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
 		mydata =3D {}
-		startpos=3D0
-		while ((startpos+8)<self.indexsize):
-			namelen=3Ddecodeint(self.index[startpos:startpos+4])
-			datapos=3Ddecodeint(self.index[startpos+4+namelen:startpos+8+namelen]=
);
-			datalen=3Ddecodeint(self.index[startpos+8+namelen:startpos+12+namelen=
]);
-			myname=3Dself.index[startpos+4:startpos+4+namelen]
-			a.seek(self.datapos+datapos)
+		startpos =3D 0
+		while ((startpos + 8) < self.indexsize):
+			namelen =3D decodeint(self.index[startpos:startpos + 4])
+			datapos =3D decodeint(self.index[startpos + 4 + namelen:startpos + 8 =
+ namelen])
+			datalen =3D decodeint(self.index[startpos + 8 + namelen:startpos + 12=
 + namelen])
+			myname =3D self.index[startpos + 4:startpos + 4 + namelen]
+			a.seek(self.datapos + datapos)
 			mydata[myname] =3D a.read(datalen)
-			startpos=3Dstartpos+namelen+12
+			startpos =3D startpos + namelen + 12
 		a.close()
 		return mydata
=20
 	def getboth(self):
-		"""Returns an array [indexSegment,dataSegment]"""
+		"""Returns an array [indexSegment, dataSegment]"""
 		if not self.scan():
 			return None
=20
 		a =3D open(_unicode_encode(self.file,
 			encoding=3D_encodings['fs'], errors=3D'strict'), 'rb')
 		a.seek(self.datapos)
-		mydata =3Da.read(self.datasize)
+		mydata =3D a.read(self.datasize)
 		a.close()
=20
 		return self.index, mydata
-