1 files changed, 32 insertions, 32 deletions
diff --git a/grc/core/schema_checker/block.py b/grc/core/schema_checker/block.py
index e36865fed0..eee1e29ea9 100644
--- a/grc/core/schema_checker/block.py
+++ b/grc/core/schema_checker/block.py
@@ -1,69 +1,69 @@
-from .utils import Spec, expand, str_
+from .utils import Spec, expand
 
 PARAM_SCHEME = expand(
-    base_key=str_,   # todo: rename/remove
+    base_key=str,   # todo: rename/remove
 
-    id=str_,
-    label=str_,
-    category=str_,
+    id=str,
+    label=str,
+    category=str,
 
-    dtype=str_,
+    dtype=str,
     default=object,
 
     options=list,
     option_labels=list,
-    option_attributes=Spec(types=dict, required=False, item_scheme=(str_, list)),
+    option_attributes=Spec(types=dict, required=False, item_scheme=(str, list)),
 
-    hide=str_,
+    hide=str,
 )
 PORT_SCHEME = expand(
-    label=str_,
-    domain=str_,
+    label=str,
+    domain=str,
 
-    id=str_,
-    dtype=str_,
-    vlen=(int, str_),
+    id=str,
+    dtype=str,
+    vlen=(int, str),
 
-    multiplicity=(int, str_),
-    optional=(bool, int, str_),
-    hide=(bool, str_),
+    multiplicity=(int, str),
+    optional=(bool, int, str),
+    hide=(bool, str),
 )
 TEMPLATES_SCHEME = expand(
-    imports=str_,
-    var_make=str_,
-    var_value=str_,
-    make=str_,
+    imports=str,
+    var_make=str,
+    var_value=str,
+    make=str,
     callbacks=list,
 )
 CPP_TEMPLATES_SCHEME = expand(
     includes=list,
-    declarations=str_,
-    make=str_,
-    var_make=str_,
+    declarations=str,
+    make=str,
+    var_make=str,
     callbacks=list,
     link=list,
     translations=dict,
 )
 BLOCK_SCHEME = expand(
-    id=Spec(types=str_, required=True, item_scheme=None),
-    label=str_,
-    category=str_,
-    flags=(list, str_),
+    id=Spec(types=str, required=True, item_scheme=None),
+    label=str,
+    category=str,
+    flags=(list, str),
 
     parameters=Spec(types=list, required=False, item_scheme=PARAM_SCHEME),
     inputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME),
     outputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME),
 
-    asserts=(list, str_),
-    value=str_,
+    asserts=(list, str),
+    value=str,
 
     templates=Spec(types=dict, required=False, item_scheme=TEMPLATES_SCHEME),
     cpp_templates=Spec(types=dict, required=False, item_scheme=CPP_TEMPLATES_SCHEME),
 
-    documentation=str_,
-    grc_source=str_,
+    documentation=str,
+    grc_source=str,
 
     file_format=Spec(types=int, required=True, item_scheme=None),
 
-    block_wrapper_path=str_,  # todo: rename/remove
+    block_wrapper_path=str,  # todo: rename/remove
 )