From patchwork Tue Jul 24 07:33:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianhong Yin X-Patchwork-Id: 10541423 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41F9517FD for ; Tue, 24 Jul 2018 07:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 259CA28759 for ; Tue, 24 Jul 2018 07:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A4E32875E; Tue, 24 Jul 2018 07:34:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B683828759 for ; Tue, 24 Jul 2018 07:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388421AbeGXIja (ORCPT ); Tue, 24 Jul 2018 04:39:30 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60404 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388431AbeGXIja (ORCPT ); Tue, 24 Jul 2018 04:39:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CBBF401EF17; Tue, 24 Jul 2018 07:34:23 +0000 (UTC) Received: from dhcp-12-115.nay.redhat.com (unknown [10.66.12.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94E38178B7; Tue, 24 Jul 2018 07:34:21 +0000 (UTC) From: jiyin@redhat.com To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" Subject: [PATCH 16/24] pynfs: python3 support plan: remove cPickle Date: Tue, 24 Jul 2018 15:33:34 +0800 Message-Id: <20180724073342.5738-16-jiyin@redhat.com> In-Reply-To: <20180724073342.5738-1-jiyin@redhat.com> References: <20180724073342.5738-1-jiyin@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Tue, 24 Jul 2018 07:34:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Tue, 24 Jul 2018 07:34:23 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jiyin@redhat.com' RCPT:'' Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Jianhong.Yin" Signed-off-by: Jianhong Yin --- nfs4.0/testserver.py | 2 +- nfs4.1/testclient.py | 2 +- nfs4.1/testserver.py | 2 +- showresults.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nfs4.0/testserver.py b/nfs4.0/testserver.py index fcee8e9..581dc3e 100755 --- a/nfs4.0/testserver.py +++ b/nfs4.0/testserver.py @@ -41,7 +41,7 @@ from optparse import OptionParser, OptionGroup, IndentedHelpFormatter import servertests.environment as environment import socket import rpc -import cPickle as pickle +import pickle VERSION="0.2" # How/when update this? diff --git a/nfs4.1/testclient.py b/nfs4.1/testclient.py index 47b74bd..3665253 100755 --- a/nfs4.1/testclient.py +++ b/nfs4.1/testclient.py @@ -34,7 +34,7 @@ from optparse import OptionParser, OptionGroup, IndentedHelpFormatter import client41tests.environment as environment import socket import rpc -import cPickle as pickle +import pickle def parse_useparams(str): return str.split(':') diff --git a/nfs4.1/testserver.py b/nfs4.1/testserver.py index c21221e..7818a5d 100755 --- a/nfs4.1/testserver.py +++ b/nfs4.1/testserver.py @@ -38,7 +38,7 @@ from optparse import OptionParser, OptionGroup, IndentedHelpFormatter import server41tests.environment as environment import socket import rpc -import cPickle as pickle +import pickle VERSION="0.2" # How/when update this? diff --git a/showresults.py b/showresults.py index ed23f7b..0b022fa 100755 --- a/showresults.py +++ b/showresults.py @@ -17,7 +17,6 @@ if __name__ == "__main__": if os.path.isfile(os.path.join(sys.path[0], 'nfs4.1', 'testmod.py')): sys.path.insert(1, os.path.join(sys.path[0], 'nfs4.1')) -#import cPickle as pickle import pickle import testmod from optparse import OptionParser