Imports are Python3 compatible

.gitignore

@@ -1,7 +1,9 @@
 syntax: glob
 *.egg-info
 *.mo
+*.swp
 *.pyc
+*.py.bak
 .DS_Store
 .idea
 .installed.cfg

src/plone/app/robotframework/_compat.py

@@ -0,0 +1,14 @@
+import sys
+
+
+PY3 = sys.version_info[0] == 3
+if PY3:
+    from http.client import HTTPConnection
+    from io import StringIO
+    from xmlrpc.client import ServerProxy
+    from xmlrpc.server import SimpleXMLRPCServer
+else:
+    from httplib import HTTPConnection
+    from StringIO import StringIO
+    from xmlrpclib import ServerProxy
+    from SimpleXMLRPCServer import SimpleXMLRPCServer

src/plone/app/robotframework/content.py

@@ -283,7 +283,7 @@ def prefill_image_types(portal, kwargs):
 
 def random_image():
     import random
-    import StringIO
+    from plone.app.robotframework._compat import StringIO
     from PIL import Image
     from PIL import ImageDraw
 
@@ -300,7 +300,7 @@ def random_image():
     )
     del draw
 
-    result = StringIO.StringIO()
+    result = StringIO()
     img.save(result, 'PNG')
     result.seek(0)
     return result

src/plone/app/robotframework/saucelabs.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
 import os
-import httplib
+from plone.app.robotframework._compat import HTTPConnection
 import base64
 try:
     import json
@@ -39,7 +39,7 @@ def report_sauce_status(self, name, status, tags=[], remote_url=''):
                            'passed': status == 'PASS',
                            'tags': tags})
 
-        connection = httplib.HTTPConnection('saucelabs.com')
+        connection = HTTPConnection('saucelabs.com')
         connection.request('PUT', '/rest/v1/%s/jobs/%s' % (
             username, job_id), body,
             headers={'Authorization': 'Basic %s' % token}

src/plone/app/robotframework/server.py

@@ -5,8 +5,8 @@
 import os
 import sys
 import time
-import xmlrpclib
-from SimpleXMLRPCServer import SimpleXMLRPCServer
+from plone.app.robotframework._compat.xmlrpc.client import ServerProxy
+from plone.app.robotframework._compat import SimpleXMLRPCServer
 
 import pkg_resources
 
@@ -196,7 +196,7 @@ class RobotListener:
     def __init__(self):
         server_listener_address = 'http://%s:%s' % (
             LISTENER_HOST, LISTENER_PORT)
-        self.server = xmlrpclib.ServerProxy(server_listener_address)
+        self.server = ServerProxy(server_listener_address)
 
     def start_test(self, name, attrs):
         self.server.zodb_setup()