Merge branch 'replwrap-test-fixes' into issue-44-solaris-try-3
Merge branch 'more-exacting-which' into issue-44-solaris-try-3
Improve EOF through test -> interact -> echo_prompt
Document and detect EOF condition in interact()
python3.2 accommodations
For python3, exceptions should use "as err", not ", err"
Merge branch 'interact-does-not-detect-eof' into issue-44-solaris-try-3
Solaris support, tested on SmartOS from cron(1).
Solaris support, tested on SmartOS from cron(1).
Missing time import -- there is no 'waitecho' function

although I am against most time.sleep()s and trying my best
to remove them where possible, there is no opposing
waitnoecho() function (perhaps we should supply one?).
Another "as err" vs ", err" exception fix.

as well as another indent-by-4 fix
Implement assertRaises and assertRaisesRegexp context managers for Python 2.6
Miscellaneous minor fixes
Merge branch 'issue-44-solaris-try-3' of github.com:pexpect/pexpect into issue-44-solaris-try-3

Conflicts:
	doc/history.rst
	pexpect/__init__.py
	tests/test_expect.py
	tests/test_interact.py
	tests/test_misc.py
	tests/test_unicode.py
Refactor exceptions in __pty_make_controlling_tty

Make very clear which exceptions we expect, where, and why.

I've done exaustive testing from within cron(1) and without.
I've been unable to reproduce the previously discovered
os.ttyname issue, so that exception handling loop has been removed.

Also, resolves the ENXIO reference (thanks TK!). Pushing to
test this on OSX and later cygwin with the non_native pty fork test
Provide example of SRV4-like systems
Use const child._VINTR instead of '3'
note using py.test -- specify 'tests' folder

On Solaris and OSX, when running a bare 'py.test', it locks up
indefinitely after line, 'collecting 0 items'. ^C also does
not respond, so I'm not able to discern exactly where the
lockup is -- regardless, if you specify the 'tests' folder,
it issues fine.
Fix up except syntax again
Merge branch 'issue-44-solaris-try-3' of github.com:pexpect/pexpect into issue-44-solaris-try-3