Rewritten horrible discovery.py.

2008-08-25, etisserant