Make lafilefixer handle files in binary mode, in order to avoid potential

character encoding issues.

1 files changed, 97 insertions, 97 deletions

diff --git a/pym/portage/tests/lafilefixer/test_lafilefixer.py b/pym/portage/tests/lafilefixer/test_lafilefixer.py
index 5e4e840f3..71ed31b64 100644
--- a/pym/portage/tests/lafilefixer/test_lafilefixer.py
+++ b/pym/portage/tests/lafilefixer/test_lafilefixer.py
@@ -8,118 +8,118 @@ from portage.exception import InvalidData
 class test_lafilefixer(TestCase):
 
 	def get_test_cases_clean(self):
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -lm'\n" + \
-			"current=6\n" + \
-			"age=0\n" + \
-			"revision=2\n" + \
-			"installed=yes\n" + \
-			"dlopen=''\n" + \
-			"dlpreopen=''\n" + \
-			"libdir='/usr/lib64'\n"
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -lm'\n" + \
-			"current=6\n" + \
-			"age=0\n" + \
-			"revision=2\n" + \
-			"installed=yes\n" + \
-			"dlopen=''\n" + \
-			"dlpreopen=''\n" + \
-			"libdir='/usr/lib64'\n"
-		yield "dependency_libs=' liba.la /usr/lib64/bar.la -lc'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -lm'\n" + \
+			b"current=6\n" + \
+			b"age=0\n" + \
+			b"revision=2\n" + \
+			b"installed=yes\n" + \
+			b"dlopen=''\n" + \
+			b"dlpreopen=''\n" + \
+			b"libdir='/usr/lib64'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -lm'\n" + \
+			b"current=6\n" + \
+			b"age=0\n" + \
+			b"revision=2\n" + \
+			b"installed=yes\n" + \
+			b"dlopen=''\n" + \
+			b"dlpreopen=''\n" + \
+			b"libdir='/usr/lib64'\n"
+		yield b"dependency_libs=' liba.la /usr/lib64/bar.la -lc'\n"
 
 	def get_test_cases_update(self):
 		#.la -> -l*
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc'\n", \
-			"dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -L/usr/lib64 -la -lb -lc'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc'\n", \
+			b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -L/usr/lib64 -la -lb -lc'\n"
 		#move stuff into inherited_linker_flags
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la -pthread /usr/lib64/libb.la -lc'\n" + \
-			"inherited_linker_flags=''\n", \
-			"dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -L/usr/lib64 -la -lb -lc'\n" + \
-			"inherited_linker_flags=' -pthread'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la -pthread /usr/lib64/libb.la -lc'\n" + \
+			b"inherited_linker_flags=''\n", \
+			b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -L/usr/lib64 -la -lb -lc'\n" + \
+			b"inherited_linker_flags=' -pthread'\n"
 		#reorder 
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la -R/usr/lib64 /usr/lib64/libb.la -lc'\n", \
-			"dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -R/usr/lib64 -L/usr/lib64 -la -lb -lc'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la -R/usr/lib64 /usr/lib64/libb.la -lc'\n", \
+			b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -R/usr/lib64 -L/usr/lib64 -la -lb -lc'\n"
 		#remove duplicates from dependency_libs (the original version didn't do it for inherited_linker_flags)
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libc.la -pthread -mt" + \
-			" -L/usr/lib -R/usr/lib64 -lc /usr/lib64/libb.la -lc'\n" +\
-			"inherited_linker_flags=' -pthread -pthread'\n", \
-			"dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' -R/usr/lib64 -L/usr/lib64 -L/usr/lib -la -lc -lb'\n" +\
-			"inherited_linker_flags=' -pthread -pthread -mt'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libc.la -pthread -mt" + \
+			b" -L/usr/lib -R/usr/lib64 -lc /usr/lib64/libb.la -lc'\n" +\
+			b"inherited_linker_flags=' -pthread -pthread'\n", \
+			b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' -R/usr/lib64 -L/usr/lib64 -L/usr/lib -la -lc -lb'\n" +\
+			b"inherited_linker_flags=' -pthread -pthread -mt'\n"
 		#-L rewriting
-		yield "dependency_libs=' -L/usr/X11R6/lib'\n", \
-			"dependency_libs=' -L/usr/lib'\n"
-		yield "dependency_libs=' -L/usr/local/lib'\n", \
-			"dependency_libs=' -L/usr/lib'\n"
-		yield "dependency_libs=' -L/usr/lib64/pkgconfig/../..'\n", \
-			"dependency_libs=' -L/usr'\n"
-		yield "dependency_libs=' -L/usr/lib/pkgconfig/..'\n", \
-			"dependency_libs=' -L/usr/lib'\n"
-		yield "dependency_libs=' -L/usr/lib/pkgconfig/../.. -L/usr/lib/pkgconfig/..'\n", \
-			"dependency_libs=' -L/usr -L/usr/lib'\n"
+		yield b"dependency_libs=' -L/usr/X11R6/lib'\n", \
+			b"dependency_libs=' -L/usr/lib'\n"
+		yield b"dependency_libs=' -L/usr/local/lib'\n", \
+			b"dependency_libs=' -L/usr/lib'\n"
+		yield b"dependency_libs=' -L/usr/lib64/pkgconfig/../..'\n", \
+			b"dependency_libs=' -L/usr'\n"
+		yield b"dependency_libs=' -L/usr/lib/pkgconfig/..'\n", \
+			b"dependency_libs=' -L/usr/lib'\n"
+		yield b"dependency_libs=' -L/usr/lib/pkgconfig/../.. -L/usr/lib/pkgconfig/..'\n", \
+			b"dependency_libs=' -L/usr -L/usr/lib'\n"
 
 	def get_test_cases_broken(self):
-		yield ""
+		yield b""
 		#no dependency_libs
-		yield "dlname='libfoo.so.1'\n" + \
-			"current=6\n" + \
-			"age=0\n" + \
-			"revision=2\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"current=6\n" + \
+			b"age=0\n" + \
+			b"revision=2\n"
 		#borken dependency_libs
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc' \n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc' \n"
 			#borken dependency_libs
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc\n"
 		#crap in dependency_libs
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n"
 		#dependency_libs twice
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n" +\
-			"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n" +\
+			b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n"
 		#inherited_linker_flags twice
-		yield "dlname='libfoo.so.1'\n" + \
-			"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
-			"old_library='libpdf.a'\n" + \
-			"inherited_linker_flags=''\n" +\
-			"inherited_linker_flags=''\n"
+		yield b"dlname='libfoo.so.1'\n" + \
+			b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + \
+			b"old_library='libpdf.a'\n" + \
+			b"inherited_linker_flags=''\n" +\
+			b"inherited_linker_flags=''\n"
 
 	def testlafilefixer(self):
 		from portage.util.lafilefixer import _parse_lafile_contents, rewrite_lafile