Merge branch 'maint-2.0' into maint-2.1

* maint-2.0:
  tags: PEP8 code style improvements
  annotations: PEP8 code style improvements
  accounts: PEP8 code style improvements

Author: jirikuncar

invenio/modules/annotations/views.py

@@ -38,9 +38,10 @@
 
 from .api import add_annotation, get_annotations, get_count
 from .forms import WebPageAnnotationForm, WebPageAnnotationFormAttachments
+from .receivers import extract_notes
 from .noteutils import get_note_title, get_original_comment, \
     note_is_collapsed, prepare_notes
-from .receivers import extract_notes
+
 
 blueprint = Blueprint('annotations',
                       __name__,

invenio/modules/tags/views.py

@@ -45,11 +45,16 @@
     TagAnnotationForm, validate_tag_exists, validate_user_owns_tag, validators
 from .models import WtgTAG, WtgTAGRecord, wash_tag
 
+from .models import \
+    WtgTAG, \
+    WtgTAGRecord, \
+    wash_tag
+
 # Uset settings
 user_settings = LocalProxy(
-    lambda:
-    current_user['settings'].get('webtag',
-                                 cfg['CFG_WEBTAG_DEFAULT_USER_SETTINGS']))
+    lambda: current_user['settings'].get(
+        'webtag', cfg['CFG_WEBTAG_DEFAULT_USER_SETTINGS']
+    ))
 
 blueprint = Blueprint('webtag', __name__, url_prefix='/yourtags',
                       template_folder='templates', static_folder='static')
@@ -450,7 +455,7 @@ def detach():
     form = DetachTagForm(request.values, csrf_enabled=False)
 
     if form.validate():
-        association = db.session.query(WtgTAGRecord) \
+        association = db.session.query(WtgTAGRecord)\
             .filter_by(id_tag=form.data['id_tag'],
                        id_bibrec=form.data['id_bibrec']).first()
         if association: