Merge from default to msabramo/improve_test_readline

Author: msabramo

.hgignore

@@ -3,3 +3,5 @@ build/
 .cache/
 \.tox/
 .*\.egg-info
+\.pyc
+\.swp

pyrepl/unix_eventqueue.py

@@ -100,7 +100,8 @@ def insert(self, event):
         self.events.append(event)
 
     def push(self, char):
-        self.buf.append(ord(char))
+        ord_char = char if isinstance(char, int) else ord(char)
+        self.buf.append(ord_char)
         if char in self.k:
             if self.k is self.ck:
                 #sanity check, buffer is empty when a special key comes

testing/test_functional.py

@@ -13,7 +13,10 @@ def pytest_funcarg__child(request):
     except SyntaxError:
         pytest.skip('pexpect wont work on py3k')
     child = pexpect.spawn(sys.executable, ['-S'], timeout=10)
-    child.logfile = sys.stdout
+    if sys.version_info >= (3, ):
+        child.logfile = sys.stdout.buffer
+    else:
+        child.logfile = sys.stdout
     child.sendline('from pyrepl.python_reader import main')
     child.sendline('main()')
     return child

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist= py27, py32
+envlist = py26, py27, pypy, py33
 
 [pytest]
 codechecks = pep8 pyflakes