summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/adapter/mail.py2
-rw-r--r--service/pixelated/adapter/mail_sender.py2
-rw-r--r--service/pixelated/controllers/__init__.py1
-rw-r--r--service/pixelated/controllers/attachments_controller.py1
-rw-r--r--service/pixelated/controllers/mails_controller.py1
-rw-r--r--service/pixelated/runserver.py4
-rw-r--r--service/pixelated/support/date.py2
-rw-r--r--service/pixelated/support/encrypted_file_storage.py3
-rw-r--r--service/pixelated/support/ext_protobuf.py4
-rw-r--r--service/pixelated/support/ext_sqlcipher.py4
10 files changed, 16 insertions, 8 deletions
diff --git a/service/pixelated/adapter/mail.py b/service/pixelated/adapter/mail.py
index 96fd8038..25e86cf3 100644
--- a/service/pixelated/adapter/mail.py
+++ b/service/pixelated/adapter/mail.py
@@ -15,6 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import json
from uuid import uuid4
+from email.mime.text import MIMEText
from leap.mail.imap.fields import fields
import leap.mail.walk as walk
@@ -22,7 +23,6 @@ import dateutil.parser as dateparser
from pixelated.adapter.status import Status
import pixelated.support.date
from email.MIMEMultipart import MIMEMultipart
-from email.mime.text import MIMEText
from pycryptopp.hash import sha256
import re
diff --git a/service/pixelated/adapter/mail_sender.py b/service/pixelated/adapter/mail_sender.py
index 6fad2b6f..50c17ba5 100644
--- a/service/pixelated/adapter/mail_sender.py
+++ b/service/pixelated/adapter/mail_sender.py
@@ -14,9 +14,9 @@
# 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 StringIO import StringIO
+
from twisted.internet.defer import Deferred
from twisted.mail.smtp import SMTPSenderFactory
-
from twisted.internet import reactor
from pixelated.support.functional import flatten
diff --git a/service/pixelated/controllers/__init__.py b/service/pixelated/controllers/__init__.py
index 33da02b8..6bc8e7c2 100644
--- a/service/pixelated/controllers/__init__.py
+++ b/service/pixelated/controllers/__init__.py
@@ -29,6 +29,7 @@ def respond_json_deferred(entity, request, status_code=200):
request.write(json_response)
request.finish()
+
import json
from home_controller import HomeController
diff --git a/service/pixelated/controllers/attachments_controller.py b/service/pixelated/controllers/attachments_controller.py
index d6d2f5e7..b3fed903 100644
--- a/service/pixelated/controllers/attachments_controller.py
+++ b/service/pixelated/controllers/attachments_controller.py
@@ -15,6 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import io
+
import re
from twisted.protocols.basic import FileSender
from twisted.python.log import err
diff --git a/service/pixelated/controllers/mails_controller.py b/service/pixelated/controllers/mails_controller.py
index d84018dc..f990bcc2 100644
--- a/service/pixelated/controllers/mails_controller.py
+++ b/service/pixelated/controllers/mails_controller.py
@@ -15,6 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import json
+
from pixelated.adapter.mail import InputMail
from pixelated.controllers import respond_json
diff --git a/service/pixelated/runserver.py b/service/pixelated/runserver.py
index b53a682b..37a55582 100644
--- a/service/pixelated/runserver.py
+++ b/service/pixelated/runserver.py
@@ -14,12 +14,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import os
import sys
import logging
import json
+
+import os
from klein import Klein
+
klein_app = Klein()
import ConfigParser
diff --git a/service/pixelated/support/date.py b/service/pixelated/support/date.py
index 8a2daaf0..e7cdbb30 100644
--- a/service/pixelated/support/date.py
+++ b/service/pixelated/support/date.py
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import datetime
-import dateutil.parser
+import dateutil.parser
from dateutil.tz import tzlocal
diff --git a/service/pixelated/support/encrypted_file_storage.py b/service/pixelated/support/encrypted_file_storage.py
index 2fae9942..c6549c06 100644
--- a/service/pixelated/support/encrypted_file_storage.py
+++ b/service/pixelated/support/encrypted_file_storage.py
@@ -15,10 +15,9 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import io
-import os
+import os
from whoosh.filedb.filestore import FileStorage
-
from whoosh.filedb.structfile import StructFile, BufferFile
from cryptography.fernet import Fernet
from whoosh.util import random_name
diff --git a/service/pixelated/support/ext_protobuf.py b/service/pixelated/support/ext_protobuf.py
index 8a8e05e6..337829ba 100644
--- a/service/pixelated/support/ext_protobuf.py
+++ b/service/pixelated/support/ext_protobuf.py
@@ -15,9 +15,11 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
-import protobuf.socketrpc.server
from sys import platform as _platform
+import protobuf.socketrpc.server
+
+
# protobuf throws a lot of 'Socket is not connected' exceptions on OSX but they are not an issue.
# refer too https://code.google.com/p/protobuf-socket-rpc/issues/detail?id=10 and
diff --git a/service/pixelated/support/ext_sqlcipher.py b/service/pixelated/support/ext_sqlcipher.py
index bd01e610..fae1df72 100644
--- a/service/pixelated/support/ext_sqlcipher.py
+++ b/service/pixelated/support/ext_sqlcipher.py
@@ -14,9 +14,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import leap.soledad.client.sqlcipher
from sys import platform as _platform
+import leap.soledad.client.sqlcipher
+
+
# WAL is breaking for the debian sqlcipher package so we need to disable it
# refer to https://leap.se/code/issues/5562