optparse.py changes for testing