From 61b01dc43cc0e1ba4f9ee4f64f05beb212831c3f Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Wed, 3 Jun 2015 21:18:46 -0300 Subject: moving imports, code moved without them --- service/pixelated/config/__init__.py | 4 +++- service/pixelated/config/app_factory.py | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py index 1e3911f3..8a3733a3 100644 --- a/service/pixelated/config/__init__.py +++ b/service/pixelated/config/__init__.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from functools import partial import sys from pixelated.config import app_factory @@ -26,6 +25,9 @@ from twisted.internet import reactor from twisted.internet.threads import deferToThread from twisted.internet import defer from twisted.web.server import Site +from OpenSSL import SSL +from twisted.internet import ssl +from OpenSSL import crypto from pixelated.config.initialize_leap import initialize_leap diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index 5584b19d..5aa0950b 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -15,13 +15,8 @@ # along with Pixelated. If not, see . import sys -from OpenSSL import SSL -from OpenSSL import crypto from twisted.internet import reactor -from twisted.internet import ssl from pixelated.resources.root_resource import RootResource -from twisted.web import resource -from twisted.web.util import redirectTo from pixelated.adapter.services.mail_service import MailService from pixelated.adapter.model.mail import InputMail from pixelated.adapter.services.mail_sender import MailSender @@ -37,7 +32,6 @@ from leap.common.events import ( unregister, events_pb2 as proto ) -from twisted.web.server import Site from .welcome_mail import check_welcome_mail CREATE_KEYS_IF_KEYS_DONT_EXISTS_CALLBACK = 12345 -- cgit v1.2.3