Merge "Fix github driver tests for py3" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index 1a1dd19..9bacf21 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -840,7 +840,7 @@
"""Emulates sending the GitHub webhook event to the connection."""
port = self.webapp.server.socket.getsockname()[1]
name, data = event
- payload = json.dumps(data)
+ payload = json.dumps(data).encode('utf8')
headers = {'X-Github-Event': name}
req = urllib.request.Request(
'http://localhost:%s/connection/%s/payload'
diff --git a/zuul/driver/github/__init__.py b/zuul/driver/github/__init__.py
index 2d6829d..e59dc58 100644
--- a/zuul/driver/github/__init__.py
+++ b/zuul/driver/github/__init__.py
@@ -14,10 +14,10 @@
from zuul.driver import Driver, ConnectionInterface, TriggerInterface
from zuul.driver import SourceInterface
-import githubconnection
-import githubtrigger
-import githubsource
-import githubreporter
+from zuul.driver.github import githubconnection
+from zuul.driver.github import githubtrigger
+from zuul.driver.github import githubsource
+from zuul.driver.github import githubreporter
class GithubDriver(Driver, ConnectionInterface, TriggerInterface,