From eed64447d14491422f07fb04b3771ea969aa37d2 Mon Sep 17 00:00:00 2001
From: Emilio Perez <emilio.perez-juarez@diamond.ac.uk>
Date: Tue, 13 Jun 2017 09:49:55 +0100
Subject: [PATCH] make StringIO import python 2 and 3 compatible

---
 .../test/unit/test_www_hooks_bitbucketserver.py  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/master/buildbot/test/unit/test_www_hooks_bitbucketserver.py b/master/buildbot/test/unit/test_www_hooks_bitbucketserver.py
index 7b9bd81aec5..ce8f78c5c60 100644
--- a/master/buildbot/test/unit/test_www_hooks_bitbucketserver.py
+++ b/master/buildbot/test/unit/test_www_hooks_bitbucketserver.py
@@ -17,7 +17,7 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-from StringIO import StringIO
+from io import StringIO
 
 from twisted.internet import defer
 from twisted.trial import unittest
@@ -30,7 +30,7 @@
 
 _CT_JSON = 'application/json'
 
-pushJsonPayload = """
+pushJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -85,7 +85,7 @@
 }
 """
 
-pullRequestCreatedJsonPayload = """
+pullRequestCreatedJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -190,7 +190,7 @@
 }
 """
 
-pullRequestUpdatedJsonPayload = """
+pullRequestUpdatedJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -295,7 +295,7 @@
 }
 """
 
-pullRequestRejectedJsonPayload = """
+pullRequestRejectedJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -400,7 +400,7 @@
 }
 """
 
-pullRequestFulfilledJsonPayload = """
+pullRequestFulfilledJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -505,7 +505,7 @@
 }
 """
 
-deleteTagJsonPayload = """
+deleteTagJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",
@@ -553,7 +553,7 @@
 }
 """
 
-deleteBranchJsonPayload = """
+deleteBranchJsonPayload = u"""
 {
 	"actor": {
 		"username": "John",