lingint #36

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = D203 W504
+ignore = D203 W504, W605
 max-line-length = 120
 exclude =
     */migrations,

vocabs/custom_layout_object.py

@@ -1,5 +1,4 @@
 from crispy_forms.layout import LayoutObject, TEMPLATE_PACK
-from django.shortcuts import render
 from django.template.loader import render_to_string
 
 
@@ -26,4 +25,4 @@ def __init__(self, formset_name_in_context, template=None):
 
     def render(self, form, form_style, context, template_pack=TEMPLATE_PACK):
         formset = context[self.formset_name_in_context]
-        return render_to_string(self.template, {'formset': formset})
+        return render_to_string(self.template, {'formset': formset})

vocabs/forms.py

@@ -2,14 +2,27 @@
 from django import forms
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Submit, Layout, Fieldset, Div, HTML, ButtonHolder
-from crispy_forms.bootstrap import *
-from .models import *
+from crispy_forms.bootstrap import Field
+from .models import (
+    SkosCollection,
+    SkosConcept,
+    SkosConceptScheme,
+    ConceptSchemeTitle,
+    ConceptSchemeDescription,
+    ConceptSchemeSource,
+    CollectionLabel,
+    CollectionNote,
+    CollectionSource,
+    ConceptLabel,
+    ConceptNote,
+    ConceptSource
+)
 from django.forms.models import inlineformset_factory
-from .custom_layout_object import *
+from .custom_layout_object import Formset
 from mptt.forms import TreeNodeChoiceField
 from django.forms import BaseInlineFormSet
 import re
-from .endpoints import *
+from .endpoints import ENDPOINT_CHOICES
 
 
 class GenericFilterFormHelper(FormHelper):
@@ -40,14 +53,14 @@ def __init__(self, *args, **kwargs):
 
 
 def custom_name_errors(field_name):
-    name_errors = {'required': '{} is required when language provided'.format(field_name)}
-    name_errors['invalid']: 'Enter a valid value'
+    name_errors = {'required': f'{field_name} is required when language provided'}
+    name_errors['invalid'] = 'Enter a valid value'
     return name_errors
 
 
 def custom_lang_errors(field_name):
-    lang_errors = {'required': 'Language is required when {} provided'.format(field_name.lower())}
-    lang_errors['invalid']: 'Enter a valid value'
+    lang_errors = {'required': f'Language is required when {field_name.lower()} provided'}
+    lang_errors['invalid'] = 'Enter a valid value'
     return lang_errors
 
 

vocabs/skos_import.py

@@ -1,9 +1,23 @@
 from rdflib import Graph, Namespace, RDF, URIRef
-from rdflib.namespace import DC, RDFS, SKOS
-from .models import *
+from .models import (
+    SkosCollection,
+    SkosConcept,
+    SkosConceptScheme,
+    ConceptSchemeTitle,
+    ConceptSchemeDescription,
+    ConceptSchemeSource,
+    CollectionLabel,
+    CollectionNote,
+    CollectionSource,
+    ConceptLabel,
+    ConceptNote,
+    ConceptSource
+)
 import re
 import logging
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth.models import User
+
 from django.db import transaction
 
 
@@ -86,7 +100,7 @@ def language_check(property_lang):
                 concept_scheme["contributor"] = ";".join(
                     [contr for contrp in allow_properties('contributor') for contr in g.objects(cs, contrp)])
                 concept_scheme["language"] = ";".join(
-                    [l for lp in allow_properties('language') for l in g.objects(cs, lp)])
+                    [lang for lp in allow_properties('language') for lang in g.objects(cs, lp)])
                 concept_scheme["subject"] = ";".join(
                     [s for sp in allow_properties('subject') for s in g.objects(cs, sp)])
                 concept_scheme["publisher"] = ";".join(

vocabs/views.py

@@ -14,7 +14,7 @@
 import time
 import datetime
 from guardian.shortcuts import get_objects_for_user
-from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.decorators import login_required
 from reversion.models import Version
 from django.db import transaction
 from django.shortcuts import redirect
@@ -161,8 +161,7 @@ def dispatch(self, *args, **kwargs):
 
 class SkosConceptSchemeUpdate(BaseUpdateView):
     model = SkosConceptScheme
-    form_class = SkosConceptSchemeForm
-    permission_required = (
+    form_class = SkosConceptSchemeForm = (
         'view_skosconceptscheme',
         'change_skosconceptscheme',
         'delete_skosconceptscheme',
@@ -337,8 +336,7 @@ def dispatch(self, *args, **kwargs):
 
 class SkosCollectionUpdate(BaseUpdateView):
     model = SkosCollection
-    form_class = SkosCollectionForm
-    permission_required = (
+    form_class = SkosCollectionForm = (
         'view_skoscollection',
         'change_skoscollection',
         'delete_skoscollection',
@@ -493,8 +491,7 @@ def dispatch(self, *args, **kwargs):
 
 class SkosConceptUpdate(BaseUpdateView):
     model = SkosConcept
-    form_class = SkosConceptForm
-    permission_required = (
+    form_class = SkosConceptForm = (
         'view_skosconcept',
         'change_skosconcept',
         'delete_skosconcept',