Fix TypeError after readline input

3 files changed, 31 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2537f501ea64..e447875851df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pyrepl-hg
 	pkgdesc = A Python library for building flexible command line interfaces
 	pkgver = r263+.9401662c4e6c+
-	pkgrel = 1
+	pkgrel = 2
 	url = http://pypi.python.org/pypi/pyrepl
 	arch = any
 	license = MIT
@@ -15,7 +15,7 @@ pkgbase = python-pyrepl-hg
 	source = py3fixes.patch
 	md5sums = SKIP
 	md5sums = 14f1a9fd02693f9d05d25fd9d1214070
-	md5sums = 3c2b239e29f8cbd617cb2de5cc93626e
+	md5sums = 7c5479c079bf68e91d8117a5b9bd2bd8
 
 pkgname = python-pyrepl-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index d00d71f9edac..7efc477daba1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=python-pyrepl-hg
 _realpkg=pyrepl
 pkgver=r263+.9401662c4e6c+
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python library for building flexible command line interfaces"
 url="http://pypi.python.org/pypi/pyrepl"
 arch=("any")
@@ -17,7 +17,7 @@ source=("hg+https://bitbucket.org/pypy/pyrepl"
         "py3fixes.patch")
 md5sums=('SKIP'
          '14f1a9fd02693f9d05d25fd9d1214070'
-         '3c2b239e29f8cbd617cb2de5cc93626e')
+         '7c5479c079bf68e91d8117a5b9bd2bd8')
 makedepends=('mercurial' 'python')
 
 pkgver() {
diff --git a/py3fixes.patch b/py3fixes.patch
index 22baad744214..20556c1e0e0c 100644
--- a/py3fixes.patch
+++ b/py3fixes.patch
@@ -171,3 +171,30 @@ diff -r 9401662c4e6c pyrepl/readline.py
          chars.sort()
          return ''.join(chars)
  
+
+Fix crash after readline input.
+
+  File "/usr/lib/python3.5/pdb.py", line 259, in user_line
+    self.interaction(frame, None)
+  File "/usr/lib/python3.5/site-packages/pdb.py", line 250, in interaction
+    self.cmdloop()
+  File "/usr/lib/python3.5/cmd.py", line 137, in cmdloop
+    line = self.precmd(line)
+  File "/usr/lib/python3.5/pdb.py", line 396, in precmd
+    marker = line.find(';;')
+TypeError: a bytes-like object is required, not 'str'
+
+diff -r 9401662c4e6c pyrepl/readline.py
+--- a/pyrepl/readline.py        Fri Dec 04 13:10:13 2015 +0000
++++ b/pyrepl/readline.py        Fri Sep 16 00:41:57 2016 +0200
+@@ -199,7 +205,9 @@
+         except _error:
+             return _old_raw_input(prompt)
+         reader.ps1 = prompt
+-        return reader.readline(startup_hook=self.startup_hook)
++        # Unicode/str is required for Python 3 (3.5.2).
++        return unicode(reader.readline(startup_hook=self.startup_hook),
++                       ENCODING)
+ 
+     def multiline_input(self, more_lines, ps1, ps2, returns_unicode=False):
+         """Read an input on possibly multiple lines, asking for more