diff options
| author | Oliver Poignant <oliver@poignant.se> | 2017-01-07 12:44:34 +0100 |
|---|---|---|
| committer | Oliver Poignant <oliver@poignant.se> | 2017-01-07 12:44:34 +0100 |
| commit | 381f7ae1fb5567d34493330286876149bee7c170 (patch) | |
| tree | e6f8ed7067753710bd0701f189fe0d4122035a4d /gitautodeploy | |
| parent | 3171f1765c1b1c5f6cc3a064fc5e2653098fc445 (diff) | |
| download | Git-Auto-Deploy-381f7ae1fb5567d34493330286876149bee7c170.zip Git-Auto-Deploy-381f7ae1fb5567d34493330286876149bee7c170.tar.gz Git-Auto-Deploy-381f7ae1fb5567d34493330286876149bee7c170.tar.bz2 | |
Fixing ImportError due to changed cwd
Diffstat (limited to 'gitautodeploy')
| -rw-r--r-- | gitautodeploy/httpserver.py | 6 | ||||
| -rw-r--r-- | gitautodeploy/wsserver.py | 3 |
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 |