cleanup

abilian/__init__.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 from __future__ import absolute_import, print_function, division
+
 from pkgutil import extend_path
 
 __path__ = extend_path(__path__, __name__)

abilian/app.py

@@ -213,7 +213,7 @@ def _finalize_assets_setup(self):
 
         for name, data in self._assets_bundles.items():
             bundles = data.get("bundles", [])
-            options = data.get("options", {})
+            options = data.get("options", {})  # type: Dict[Text, Any]
             filters = options.get("filters") or []
             options["filters"] = []
             for f in filters:

abilian/services/conversion/handlers.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
@@ -11,14 +12,14 @@
 import threading
 import traceback
 from abc import ABCMeta, abstractmethod
-from base64 import decodestring, encodestring
+from base64 import decodebytes, encodebytes
 from pathlib import Path
 from typing import List
 
 from magic import Magic
 from six import add_metaclass, raise_from, text_type
 
-from abilian.services.image import FIT, resize
+from abilian.services.image import resize
 
 from .service import ConversionError
 from .util import get_tmp_dir, make_temp_file
@@ -494,7 +495,7 @@ def convert(self, key):
         in_mime_type = open("data/{}.mime".format(key)).read()
         file_extension = mimetypes.guess_extension(in_mime_type).strip(".")
 
-        data = encodestring(open(in_fn).read())
+        data = encodebytes(open(in_fn, "rb").read())
         proxy = ServerProxy(self.SERVER_URL, allow_none=True)
 
         if in_mime_type.startswith("application/vnd.oasis.opendocument"):
@@ -504,7 +505,7 @@ def convert(self, key):
             data = proxy.convertFile(data, file_extension, pivot_format)
             data = proxy.convertFile(data, pivot_format, "pdf")
 
-        converted = decodestring(data)
+        converted = decodebytes(data)
         new_key = hashlib.md5(converted).hexdigest()
         with open("data/{}.blob".format(new_key), "wb") as fd:
             fd.write(converted)

abilian/services/image/__init__.py

@@ -5,10 +5,10 @@
 
 import hashlib
 from io import BytesIO
+from typing import Dict
 
 from PIL import Image
 from six import binary_type
-from typing import Dict
 
 __all__ = ["resize", "RESIZE_MODES", "SCALE", "FIT", "CROP"]
 

abilian/services/image/tests/test_image.py

@@ -6,7 +6,7 @@
 
 from pytest import fixture
 
-from .. import CROP, FIT, SCALE, get_save_format, get_size, resize
+from .. import CROP, SCALE, get_save_format, get_size, resize
 
 
 @fixture

abilian/services/settings/service.py

@@ -3,9 +3,10 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from six import iteritems
 from typing import Text
 
+from six import iteritems
+
 from abilian.core.extensions import db
 from abilian.services import Service
 

abilian/web/action.py

@@ -17,7 +17,14 @@
 
 log = logging.getLogger(__name__)
 
-__all__ = ("Action", "ButtonAction", "FAIcon", "ModalActionMixin", "Endpoint", "actions")
+__all__ = (
+    "Action",
+    "ButtonAction",
+    "FAIcon",
+    "ModalActionMixin",
+    "Endpoint",
+    "actions",
+)
 
 
 class Status(UniqueName):

abilian/web/forms/widgets.py

@@ -12,7 +12,7 @@
 import re
 from collections import namedtuple
 from datetime import datetime
-from typing import Dict, Text, Any
+from typing import Any, Dict, Text
 
 import bleach
 import sqlalchemy as sa

abilian/web/setupwizard/__init__.py

@@ -5,6 +5,7 @@
 import logging
 import socket
 from collections import OrderedDict, namedtuple
+from pathlib import Path
 
 import redis
 import six
@@ -20,7 +21,6 @@
     session,
     url_for,
 )
-from pathlib import Path
 from six import text_type
 
 from abilian.core.commands import config as cmd_config

conftest.py

@@ -19,6 +19,7 @@
 
 if os.environ.get("FAIL_ON_WARNINGS"):
     # Don't remove !
+    # noinspection PyUnresolvedReferences
     import pandas
 
     warnings.simplefilter("error")