Fix timeout not working for functions using recvpred.

[peter50216]

For example, recvregex.

Also delete some useless code.

[peter50216]

Don't know why travis test fail... It does pass in my VM, and the error doesn't seems to be relevant to the changed code. Could someone rerun the travis test please?

[peter50216]

Accidentally deleted the commit on github :(. Reopened.

[TethysSvensson]

@zachriggle: Is this still relevant after #636?

[zachriggle]

The reporter did not provide a test case which failed, only some code changes which now cause merge conflicts.

Everything looks like it works for me, after #636.

>>> r=remote('google.com', 80, timeout=3)
[x] Opening connection to google.com on port 80
[x] Opening connection to google.com on port 80: Trying 2a00:1450:4009:808::200e
[+] Opening connection to google.com on port 80: Done
>>> r.recvregex('foobar')
''