diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-06-03 21:18:46 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-06-03 21:18:46 -0300 |
| commit | 61b01dc43cc0e1ba4f9ee4f64f05beb212831c3f (patch) | |
| tree | 8314f29210bd805a562e72551003d040a39cb364 | |
| parent | 77ba241539e2443503c54cc59131c80abc62c7e9 (diff) | |
moving imports, code moved without them
| -rw-r--r-- | service/pixelated/config/__init__.py | 4 | ||||
| -rw-r--r-- | service/pixelated/config/app_factory.py | 6 |
2 files changed, 3 insertions, 7 deletions
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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. 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 |