Fix issue #1707. When raw_input() was removed, it was incorrectly replaced

with sys.stdin.readline().  I wonder how many other places are affected
by the same bug?