patch 8.0.0005

Problem:    Netbeans test fails with Python 3. (Jonathonf)
Solution:   Encode the string before sending it. (closes #1070)

diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py
index 3471dd95268a1c0ba5b7887f19cd0057981cf147..e0d291d60d4acfc1bdacba97aae68f0d648fbac6 100644 (file)
--- a/src/testdir/test_netbeans.py
+++ b/src/testdir/test_netbeans.py
@@ -52,7 +52,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                 return
 
             if len(response) > 0:
-                self.request.sendall(response)
+                self.request.sendall(response.encode('utf-8'))
                 # Write the respoinse into the file, so that the test can knows
                 # the command was sent.
                 with open("Xnetbeans", "a") as myfile:

diff --git a/src/version.c b/src/version.c
index 5634114385ce0e081b6670a949f21aee64158623..77d35a2dc3f21f5b6028a52637e2ce9fb3ba2df6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5,
 /**/
     4,
 /**/