From: Walter Dörwald <walter@livinglogic.de>
Date: Thu, 7 Jun 2007 19:26:24 +0000 (+0000)
Subject: Fix libc_ver(): libc_ver() was reading sys.executable
X-Git-Tag: v3.0a1~814
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3b6ac796f160ed27d2d1094ef606514ac3ae898;p=python

Fix libc_ver(): libc_ver() was reading sys.executable
in binary mode and comparing the content to strings,
which failed. Now the bytes get decoded into unicode
using latin-1 (the comparison compares ASCII strings
only anyway, and we don't want the decoding to fail).
---

diff --git a/Lib/platform.py b/Lib/platform.py
index ed5d22dd97..bd9efe6f98 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -145,12 +145,12 @@ def libc_ver(executable=sys.executable,lib='',version='',
         # able to open symlinks for reading
         executable = os.path.realpath(executable)
     f = open(executable,'rb')
-    binary = f.read(chunksize)
+    binary = f.read(chunksize).decode('latin-1')
     pos = 0
     while 1:
         m = _libc_search.search(binary,pos)
         if not m:
-            binary = f.read(chunksize)
+            binary = f.read(chunksize).decode('latin-1')
             if not binary:
                 break
             pos = 0