summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gitautodeploy/httpserver.py6
-rw-r--r--gitautodeploy/wsserver.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/gitautodeploy/httpserver.py b/gitautodeploy/httpserver.py
index 290d0f8..65ccc3d 100644
--- a/gitautodeploy/httpserver.py
+++ b/gitautodeploy/httpserver.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from .webhook import WebhookRequestFilter, WebbhookRequestProcessor
+from .events import WebhookAction
+
def WebhookRequestHandlerFactory(config, event_store, server_status, is_https=False):
"""Factory method for webhook request handler class"""
try:
@@ -88,8 +92,6 @@ def WebhookRequestHandlerFactory(config, event_store, server_status, is_https=Fa
from threading import Timer
import logging
import json
- from .events import WebhookAction
- from .webhook import WebhookRequestFilter, WebbhookRequestProcessor
import threading
logger = logging.getLogger()
diff --git a/gitautodeploy/wsserver.py b/gitautodeploy/wsserver.py
index 294b6f3..1ce2e59 100644
--- a/gitautodeploy/wsserver.py
+++ b/gitautodeploy/wsserver.py
@@ -1,3 +1,5 @@
+from .events import SystemEvent
+
try:
from autobahn.websocket import WebSocketServerProtocol
except ImportError:
@@ -7,7 +9,6 @@ def WebSocketClientHandlerFactory(config, clients, event_store, server_status):
"""Factory method for webhook request handler class"""
class WebSocketClientHandler(WebSocketServerProtocol, object):
- from .events import SystemEvent
def __init__(self, *args, **kwargs):
self._config = config