]> granicus.if.org Git - python/commitdiff
Fix libc_ver(): libc_ver() was reading sys.executable
authorWalter Dörwald <walter@livinglogic.de>
Thu, 7 Jun 2007 19:26:24 +0000 (19:26 +0000)
committerWalter Dörwald <walter@livinglogic.de>
Thu, 7 Jun 2007 19:26:24 +0000 (19:26 +0000)
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).

Lib/platform.py

index ed5d22dd972da696d0b97932dfed70c7bd04ed08..bd9efe6f98b5ed502c24fcb74749d76343f03a87 100755 (executable)
@@ -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