fix review comments

pushapkscript/task.py

@@ -9,13 +9,16 @@
 
 def extract_android_product_from_scopes(context):
     prefixes = _get_scope_prefixes(context)
-    scopes = _extract_scopes_from_unique_prefix(
-        scopes=context.task['scopes'],
-        prefixes=prefixes
-    )
+    all_scopes_starting_with_all_prefixes = [
+         scope
+         for scope in context.task['scopes']
+         for prefix in prefixes
+         if scope.startswith(prefix)
+    ]
+
     scope = get_single_item_from_sequence(
-        scopes,
-        condition=lambda _: True,     # scopes must just contain 1 single item
+        all_scopes_starting_with_all_prefixes,
+        condition=lambda _: True,     # it must just contain 1 single item
         ErrorClass=TaskVerificationError,
         no_item_error_message='No scope starting with any of these prefixes {} found'.format(prefixes),
         too_many_item_error_message='More than one scope found',
@@ -32,25 +35,3 @@ def _get_scope_prefixes(context):
         prefix if prefix.endswith(':') else '{}:'.format(prefix)
         for prefix in prefixes
     ]
-
-
-def _extract_scopes_from_unique_prefix(scopes, prefixes):
-    scopes = [
-         scope
-         for scope in scopes
-         for prefix in prefixes
-         if scope.startswith(prefix)
-    ]
-    _check_scopes_exist_and_all_have_the_same_prefix(scopes, prefixes)
-    return scopes
-
-
-def _check_scopes_exist_and_all_have_the_same_prefix(scopes, prefixes):
-    for prefix in prefixes:
-        if all(scope.startswith(prefix) for scope in scopes):
-            break
-    else:
-        raise TaskVerificationError(
-            'Scopes must exist and all have the same prefix. '
-            'Given scopes: {}. Allowed prefixes: {}'.format(scopes, prefixes)
-        )