From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 113792 invoked by alias); 7 Jan 2016 21:43:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 113706 invoked by uid 89); 7 Jan 2016 21:43:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=Hx-languages-length:2372, imports X-HELO: usplmg21.ericsson.net Received: from usplmg21.ericsson.net (HELO usplmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 07 Jan 2016 21:43:38 +0000 Received: from EUSAAHC008.ericsson.se (Unknown_Domain [147.117.188.96]) by usplmg21.ericsson.net (Symantec Mail Security) with SMTP id 1E.7B.32102.AFBDE865; Thu, 7 Jan 2016 22:43:23 +0100 (CET) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.96) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 7 Jan 2016 16:43:35 -0500 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] perf testsuite: python 3 fixes Date: Thu, 07 Jan 2016 21:43:00 -0000 Message-ID: <1452203012-19728-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2016-01/txt/msg00119.txt.bz2 There are a few errors when trying to run the performance testsuite with Python 3. This commit fixes them. In Python 2, it was possible to use relative imports (importing a module relative to the current one). In Python 3 it isn't. So I use absolute_import from the __future__ module, which allows Python 2 to behave like Python 3, and use the Python 3 syntax. In Python 3, dict.iterkeys doesn't exist anymore. Using dict.keys is a good compromise in this case. gdb/testsuite/ChangeLog: * gdb.perf/lib/perftest/perftest.py: Change relative imports to absolute. (SingleStatisticTestResult.report): Use dict.keys instead of dict.iterkeys. --- gdb/testsuite/gdb.perf/lib/perftest/perftest.py | 15 +++++++++------ gdb/testsuite/gdb.perf/lib/perftest/testresult.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.perf/lib/perftest/perftest.py b/gdb/testsuite/gdb.perf/lib/perftest/perftest.py index b78f83b..26d4425 100644 --- a/gdb/testsuite/gdb.perf/lib/perftest/perftest.py +++ b/gdb/testsuite/gdb.perf/lib/perftest/perftest.py @@ -13,12 +13,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import testresult -import reporter -from measure import Measure -from measure import MeasurementCpuTime -from measure import MeasurementWallTime -from measure import MeasurementVmSize +from __future__ import absolute_import + +import perftest.testresult as testresult +import perftest.reporter as reporter +from perftest.measure import Measure +from perftest.measure import MeasurementCpuTime +from perftest.measure import MeasurementWallTime +from perftest.measure import MeasurementVmSize + class TestCase(object): """Base class of all performance testing cases. diff --git a/gdb/testsuite/gdb.perf/lib/perftest/testresult.py b/gdb/testsuite/gdb.perf/lib/perftest/testresult.py index 4a62cf5..6747dcc 100644 --- a/gdb/testsuite/gdb.perf/lib/perftest/testresult.py +++ b/gdb/testsuite/gdb.perf/lib/perftest/testresult.py @@ -42,7 +42,7 @@ class SingleStatisticTestResult(TestResult): def report(self, reporter, name): reporter.start() - for key in sorted(self.results.iterkeys()): + for key in sorted(self.results.keys()): reporter.report(name, key, self.results[key]) reporter.end() -- 2.5.1