From patchwork Mon Sep 3 18:16:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Kogut X-Patchwork-Id: 965632 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IHTY1Vp7"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4243dC25Jjz9s3x for ; Tue, 4 Sep 2018 07:53:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BD184872AA; Mon, 3 Sep 2018 18:16:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l1LMnWf-SuVz; Mon, 3 Sep 2018 18:16:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D58CD87281; Mon, 3 Sep 2018 18:16:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1A26A1C0485 for ; Mon, 3 Sep 2018 18:16:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 176128621D for ; Mon, 3 Sep 2018 18:16:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0G75DeyDZqRr for ; Mon, 3 Sep 2018 18:16:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7D79086216 for ; Mon, 3 Sep 2018 18:16:10 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id l9-v6so480423pff.9 for ; Mon, 03 Sep 2018 11:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hmnKXa/2FJny4RJxCfyMAtum0Z9CKwm2HS4C849sB/s=; b=IHTY1Vp77h6stDPZM8PCiN5WRZEqSgBETVMUFWsMGx0xouB5d4aBze+JclE9azo2W9 FIvUNKUDgroPb9JsX/aaHLmbJvxGMyePkjyxGoq6pEmhwGOq4W/HnmRwp1vL6MRxpuzt 9SdM3AL2rJQF8ypvebMTiZAKqDOs1kk2ugnxyNKRbSEvp9xCzIn4AlvOzqeZdWAdRdPi IQ9aduhTXSOyq/DYShQCzRQlc0IsIXKMDMpuib35jwGIqRPHCvCo9tchomWu1EuLxsiD eyXXK4KRJDTzpJuyBne+wqLYcJUW7dUSvav9F0wHet6M/PLqqzZCi+ofZFQeFbKxW5RY 687Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hmnKXa/2FJny4RJxCfyMAtum0Z9CKwm2HS4C849sB/s=; b=aLDCs3TXED2GYE8i1+hprVH/u7t06qVHYAmF9ZG+tfXEYRr++t7KlZ510okB36MF8R wSXl4uRjZ4F4rW6GoZirBWDfN9+nsJUA/T2yxpl9e2+Qd3Wz0SJTonxf+y7f6pgihAQN jhQhF87/oOeH9QtiRpXuwALfkT9N+Xn5jtGLZwK/X1Qw4YM6dDJwOTZL9DrWMNMAxP8S wUgWYMHXCa8K7BueqTzZezWS+I9GMzWf40VxReVdMS2dMn/3R94iJUo/GruhoA9yw5qu /lJziF0Z+Fx0IZIBpyGQ1jATrb1OHJSxoyBlT2qlCrRR1LE5irzsh8gdVzRFlar5TQaO XNEw== X-Gm-Message-State: APzg51CuAzRdmtr6eW+dFjCQNf3vhl16e6UbSKoPmWhRygYu6SKmkZyH nZjfh1aCz4anj4BxNB++QN34mCMh X-Google-Smtp-Source: ANB0VdY8/b/p0rPSk87DVSuZCUg+MftIzf28zAdtvUFFNtcN+E23+v0vvWG4fpX5fFYuQL6nn+5YKA== X-Received: by 2002:a62:444d:: with SMTP id r74-v6mr30592499pfa.96.1535998569788; Mon, 03 Sep 2018 11:16:09 -0700 (PDT) Received: from localhost.localdomain ([162.251.69.147]) by smtp.gmail.com with ESMTPSA id s16-v6sm25034394pfm.114.2018.09.03.11.16.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Sep 2018 11:16:09 -0700 (PDT) From: Joseph Kogut To: buildroot@buildroot.org Date: Mon, 3 Sep 2018 11:16:07 -0700 Message-Id: <20180903181607.817-1-joseph.kogut@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib: fix python3 compatibility X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph Kogut , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Joseph Kogut --- utils/checkpackagelib/lib.py | 2 +- utils/checkpackagelib/lib_config.py | 10 +++++----- utils/checkpackagelib/lib_hash.py | 10 +++++----- utils/checkpackagelib/lib_mk.py | 10 +++++----- utils/checkpackagelib/lib_patch.py | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/utils/checkpackagelib/lib.py b/utils/checkpackagelib/lib.py index 91f4ad49b7..06b147a470 100644 --- a/utils/checkpackagelib/lib.py +++ b/utils/checkpackagelib/lib.py @@ -1,6 +1,6 @@ # See utils/checkpackagelib/readme.txt before editing this file. -from base import _CheckFunction +from .base import _CheckFunction class ConsecutiveEmptyLines(_CheckFunction): diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 1d273f1c5f..f6dc583a08 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -5,11 +5,11 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from .base import _CheckFunction +from .lib import ConsecutiveEmptyLines # noqa: F401 +from .lib import EmptyLastLine # noqa: F401 +from .lib import NewlineAtEof # noqa: F401 +from .lib import TrailingSpace # noqa: F401 def _empty_or_comment(text): diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 6d4cc9fd62..3ddd88bae9 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -5,11 +5,11 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from .base import _CheckFunction +from .lib import ConsecutiveEmptyLines # noqa: F401 +from .lib import EmptyLastLine # noqa: F401 +from .lib import NewlineAtEof # noqa: F401 +from .lib import TrailingSpace # noqa: F401 def _empty_line_or_comment(text): diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 86e9aa2d97..263b7b010d 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -6,11 +6,11 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from .base import _CheckFunction +from .lib import ConsecutiveEmptyLines # noqa: F401 +from .lib import EmptyLastLine # noqa: F401 +from .lib import NewlineAtEof # noqa: F401 +from .lib import TrailingSpace # noqa: F401 class Indent(_CheckFunction): diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index 555621afa1..4b1b48e6ca 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -5,8 +5,8 @@ import re -from base import _CheckFunction -from lib import NewlineAtEof # noqa: F401 +from .base import _CheckFunction +from .lib import NewlineAtEof # noqa: F401 class ApplyOrder(_CheckFunction):