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

[André Erdmann]

commit:     a69da1d2747962af84d2ad1e1ec9bc54746d7056
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 30 13:50:28 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 30 13:50:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a69da1d2

util.fileio: strip newlines if preparse is True

Strip newline chars ('\n', currently) at the end of each line if preparse is set
to True.

---
 roverlay/util/fileio.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/roverlay/util/fileio.py b/roverlay/util/fileio.py
index c6e33e5..a8d2e01 100644
--- a/roverlay/util/fileio.py
+++ b/roverlay/util/fileio.py
@@ -30,13 +30,20 @@ SUPPORTED_COMPRESSION = {
    COMP_BZIP2 : bz2.BZ2File,
 }
 
+def strip_newline ( s ):
+   return s.rstrip ( '\n' )
+# --- end of strip_newline (...) ---
 
 def read_compressed_file_handle ( CH, preparse=None ):
    if preparse is None:
       for line in CH.readlines():
          yield bytes_try_decode ( line )
+   elif preparse is True:
+      for line in CH.readlines():
+         yield strip_newline ( bytes_try_decode ( line ))
    else:
-      yield preparse ( bytes_try_decode ( line ) )
+      for line in CH.readlines():
+         yield preparse ( bytes_try_decode ( line ) )
 # --- end of read_compressed_file_handle (...) ---
 
 def read_text_file ( filepath, preparse=None, try_harder=True ):
@@ -50,6 +57,7 @@ def read_text_file ( filepath, preparse=None, try_harder=True ):
                    be detected (defaults to True)
    """
 
+
    ftype         = guess_filetype ( filepath )
    compress_open = SUPPORTED_COMPRESSION.get ( ftype[1], None )
 
@@ -82,6 +90,9 @@ def read_text_file ( filepath, preparse=None, try_harder=True ):
             if preparse is None:
                for line in FH.readlines():
                   yield line
+            elif preparse is True:
+               for line in FH.readlines():
+                  yield strip_newline ( line )
             else:
                for line in FH.readlines():
                   yield preparse ( line )
@@ -91,6 +102,9 @@ def read_text_file ( filepath, preparse=None, try_harder=True ):
          if preparse is None:
             for line in FH.readlines():
                yield line
+         elif preparse is True:
+            for line in FH.readlines():
+               yield strip_newline ( line )
          else:
             for line in FH.readlines():
                yield preparse ( line )
@@ -117,18 +131,17 @@ def write_text_file (
             CH.write ( str ( line ).encode() )
             if append_newlines:
                CH.write ( NL )
-         else:
-            if append_newline_eof:
-               CH.write ( NL )
+
+         if append_newline_eof:
+            CH.write ( NL )
    else:
       with open ( filepath, mode ) as FH:
          for line in lines:
             FH.write ( str ( line ) )
             if append_newlines:
                FH.write ( newline )
-         else:
-            if append_newline_eof:
-               FH.write ( newline )
+         if append_newline_eof:
+            FH.write ( newline )
 
    return True
 # --- end of write_text_file (...) ---