Reverted the previous change to read() and readline(). Kevin Jacobs found that the code simplification did not exactly match the semantics of the original.  Regression test cases were requested.
Reverted the previous change to read() and readline().
Kevin Jacobs found that the code simplification did not
exactly match the semantics of the original.  Regression
test cases were requested.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator