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

[André Erdmann]

commit:     39ec3079553c96ff8f1d0522b47d8f6f09fa6d7c
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul  2 16:42:49 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul  2 16:42:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=39ec3079

DescriptionReader: decode non-str lines

	modified:   roverlay/rpackage/descriptionreader.py

---
 roverlay/rpackage/descriptionreader.py |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py
index 94f36a3..1b3f62f 100644
--- a/roverlay/rpackage/descriptionreader.py
+++ b/roverlay/rpackage/descriptionreader.py
@@ -215,22 +215,23 @@ class DescriptionReader ( object ):
 			else:
 				fh = th.extractfile ( config.get ( 'DESCRIPTION.file_name' ) )
 
-			# have to decode the lines
-			read = lambda lines : [ line.decode().rstrip() for line in lines ]
 		else:
 			# open file handle only
 			fh = open ( filepath, 'r' )
-			read = lambda lines : [ line.rstrip() for line in lines ]
 
-		x = None
-		read_lines = read ( fh.readlines() )
-		del x, read
+
+		# 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()
+		)
 
 		fh.close()
 		if not th is None: th.close()
 		del fh, th
 
-		if hasattr ( self, 'write_desc_file' ):
+		if read_lines and hasattr ( self, 'write_desc_file' ):
 			try:
 				util.dodir ( DescriptionReader.WRITE_DESCFILES_DIR )
 				fh = open ( self.write_desc_file, 'w' )