[gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/

["André Erdmann" <dywi@mailerd.de>]

commit:     9692add5a980cd10bd8e4841c9b8e55aa46a8d91
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug  7 08:49:19 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug  7 08:49:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9692add5

descriptionreader: use bytes_try_decode() from strutil

---
 roverlay/rpackage/descriptionreader.py |   61 +++++++++++++++++--------------
 1 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py
index a5e645e..354ac94 100644
--- a/roverlay/rpackage/descriptionreader.py
+++ b/roverlay/rpackage/descriptionreader.py
@@ -9,6 +9,7 @@
 __all__ = [ 'DescriptionReader', 'make_desc_packageinfo', ]
 
 import re
+import sys
 import tarfile
 import os.path
 import time
@@ -207,38 +208,42 @@ class DescriptionReader ( object ):
 			"Starting to read file {f!r} ...\n".format ( f=filepath )
 		)
 
-		if not ( isinstance ( filepath, str ) and filepath ):
-			raise Exception ( "bad usage" )
-
-		# read describes how to import the lines from a file (e.g. rstrip())
-		#  fh, th are file/tar handles
-		read = th = fh = None
+		try:
+			# read describes how to import the lines from a file (e.g. rstrip())
+			#  fh, th are file/tar handles
+			read = th = fh = None
+
+			if tarfile.is_tarfile ( filepath ):
+				# filepath is a tarball, open tar handle + file handle
+				th = tarfile.open ( filepath, mode='r' )
+				if pkg_name:
+					fh = th.extractfile (
+						pkg_name + os.path.sep + \
+							config.get ( 'DESCRIPTION.file_name' )
+					)
+				else:
+					fh = th.extractfile ( config.get ( 'DESCRIPTION.file_name' ) )
 
-		if tarfile.is_tarfile ( filepath ):
-			# filepath is a tarball, open tar handle + file handle
-			th = tarfile.open ( filepath, mode='r' )
-			if pkg_name:
-				fh = th.extractfile (
-					pkg_name + os.path.sep + config.get ( 'DESCRIPTION.file_name' )
+			else:
+				# open file handle only
+				# COULDFIX: .Z compressed tar files could be opened here
+				fh = open ( filepath, 'r' )
+
+			if sys.version_info >= ( 3, ):
+				# decode lines of they're only bytes, using isinstance ( <>, str )
+				# 'cause isinstance ( <str>, bytes ) returns True
+				# FIXME: encoding is unknown, could be ascii/iso8859*/utf8
+				read_lines = tuple (
+					strutil.bytes_try_decode ( l ).rstrip() for l in fh.readlines()
 				)
 			else:
-				fh = th.extractfile ( config.get ( 'DESCRIPTION.file_name' ) )
-
-		else:
-			# open file handle only
-			# COULDFIX: .Z compressed tar files could be opened here
-			fh = open ( filepath, 'r' )
-
-		# decode lines of they're only bytes, using isinstance ( <>, str )
-		# 'cause isinstance ( <str>, bytes ) returns True
-		read_lines = tuple (
-			( line if isinstance ( line, str ) else line.decode() ).rstrip()
-				for line in fh.readlines()
-		)
+				# python2 shouldn't need special decoding
+				read_lines = tuple ( l.rstrip() for l in fh.readlines() )
 
-		fh.close()
-		if not th is None: th.close()
-		del fh, th
+		finally:
+			if 'fh' in locals() and fh: fh.close()
+			if 'th' in locals() and th: th.close()
+			del fh, th
 
 		if read_lines and hasattr ( self, 'write_desc_file' ):
 			try: