3c3
< import os, re, sys
---
> import os, re, sys, os.path
120c120,135
<         _default_version = link = os.readlink('/usr/bin/python')
---
>         seenlinks = []
>         link = "/usr/bin/python"
>         while True:
>             try:
>                 _default_version = link = os.readlink(link)
>             except OSError, e:
>                 if e.errno == 22:
>                     break
>                 else:
>                     raise
> 
>             if link in seenlinks:
>                 raise ValueError, "/usr/bin/python leads to circular link"
>             else:
>                 seenlinks.append(link)
>                 
122c137
<         return _default_version[6:]
---
>         return os.path.basename(_default_version)[6:]
124c139
<         return _default_version
---
>         return os.path.basename(_default_version)