From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3737AC48BE5 for ; Wed, 23 Jun 2021 19:09:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15D07610A0 for ; Wed, 23 Jun 2021 19:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229922AbhFWTL4 (ORCPT ); Wed, 23 Jun 2021 15:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbhFWTLw (ORCPT ); Wed, 23 Jun 2021 15:11:52 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 387B7C061574 for ; Wed, 23 Jun 2021 12:09:34 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id 142-20020a370d940000b02903b12767b75aso3676717qkn.6 for ; Wed, 23 Jun 2021 12:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=J6FXlCH6GdU6G8KE2DrypG+FaXn/OBwuSoRNmfTEo4Y=; b=Zv53Jlk8RsxRXVXxyvdxFRA86daaO67Qno0OYRPiOYqDm704ItdVfLG/RTQRWPRWd0 d8h50fETiRYyTsddvWgQoNke/RRXUz4gLq3fN85APG4SZ1PMWtSjHef2s3ACiksAn/rB qirS2ynXEGrmcmtz2etIQbisE11XpcBz6OrJqsWgw8r0AipAdjEF8J6hLsX3LuD+teGW qDIfRoRKiFkGQKafhpzD7dJFuUuo1eSCqrWmPoZcHFu0OyuqvMo1MftepJMeqISMaXvG FZqZ1HVBoAMJONmQ1JR8obgHPp3DPy6CvuUTjJzs7qpUb5oTgaTfAvXig4k8STXl4XqB C8rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=J6FXlCH6GdU6G8KE2DrypG+FaXn/OBwuSoRNmfTEo4Y=; b=GxP91v1Ujev7BIHWylv45BlKhPvhZOjEcICdFL64x4kFoZQgupWHyEbVhGkyOPKg5b M3H2w5eP/R0WZuJZ36S/8vDJ8AEVDepwdw8+lQWDu7Kxlydk3JiQo+UB0O6gGQ/KdZci SsOPprNe0D5ZWCxjpiD3XnrqjNOpKGWEUXoQwOJY2vA3puHNL2S8dOgnxpfHdzhh3RBF wo2eQvBUmwOM10iUqNFLS7Qxw92KP2d/hw+VN8ASlHEv2MfUs84WUXU0pLXicOgbx/XH NJ4Zn6q8GUyRvJZD5hpmStCpN8Jfp3uSBQDWMVx2ubuRLiprl379A85S2pXOLRf83GsT P/+Q== X-Gm-Message-State: AOAM531Z12n7nbaOiupOc4t/NI7YUWr6CNiuW810iKsAJF073eq5SxX7 5KBH3a5cPTQqoOBsetyXRB9bKHNYrlJ6vQ== X-Google-Smtp-Source: ABdhPJxDi48BGKHwxZ5fCr6+LLXgqU2ZiUABwokrBZKuGhuHj1qWSvi7pOGHas56dDEuDRZUgzHaAlL+0Trk7A== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:bb8a:281b:ed1:24b3]) (user=dlatypov job=sendgmr) by 2002:a05:6902:1028:: with SMTP id x8mr1465157ybt.140.1624475373332; Wed, 23 Jun 2021 12:09:33 -0700 (PDT) Date: Wed, 23 Jun 2021 12:09:19 -0700 Message-Id: <20210623190919.956814-1-dlatypov@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog Subject: [PATCH] kunit: tool: remove unnecessary "annotations" import From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The import was working around the fact "tuple[T]" was used instead of typing.Tuple[T]. Convert it to use type.Tuple to be consistent with how the rest of the code is anotated. Signed-off-by: Daniel Latypov --- tools/testing/kunit/kunit_kernel.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index e1951fa60027..5987d5b1b874 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -6,15 +6,13 @@ # Author: Felix Guo # Author: Brendan Higgins -from __future__ import annotations import importlib.util import logging import subprocess import os import shutil import signal -from typing import Iterator -from typing import Optional +from typing import Iterator, Optional, Tuple from contextlib import ExitStack @@ -208,7 +206,7 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT raise ConfigError(arch + ' is not a valid arch') def get_source_tree_ops_from_qemu_config(config_path: str, - cross_compile: Optional[str]) -> tuple[ + cross_compile: Optional[str]) -> Tuple[ str, LinuxSourceTreeOperations]: # The module name/path has very little to do with where the actual file # exists (I learned this through experimentation and could not find it base-commit: 87c9c16317882dd6dbbc07e349bc3223e14f3244 -- 2.32.0.93.g670b81a890-goog