From patchwork Tue Jul 24 07:33:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianhong Yin X-Patchwork-Id: 10541407 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 54E7917FD for ; Tue, 24 Jul 2018 07:34:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B22C28759 for ; Tue, 24 Jul 2018 07:34:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F38F2875E; Tue, 24 Jul 2018 07:34:07 +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 CD3CD28759 for ; Tue, 24 Jul 2018 07:34:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388410AbeGXIjM (ORCPT ); Tue, 24 Jul 2018 04:39:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54816 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388391AbeGXIjM (ORCPT ); Tue, 24 Jul 2018 04:39:12 -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 A32427DAC6; Tue, 24 Jul 2018 07:34:05 +0000 (UTC) Received: from dhcp-12-115.nay.redhat.com (unknown [10.66.12.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17939178B3; Tue, 24 Jul 2018 07:34:03 +0000 (UTC) From: jiyin@redhat.com To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" Subject: [PATCH 08/24] pynfs: python3 support plan: cStringIO -> StringIO Date: Tue, 24 Jul 2018 15:33:26 +0800 Message-Id: <20180724073342.5738-8-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.2]); Tue, 24 Jul 2018 07:34:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 24 Jul 2018 07:34:05 +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" try: # python2 import cStringIO.StringIO as StringIO except: # python3 from io import StringIO Signed-off-by: Jianhong Yin --- nfs4.0/nfs4state.py | 5 ++--- nfs4.1/fs.py | 5 ++++- xdr/xdrgen.py | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nfs4.0/nfs4state.py b/nfs4.0/nfs4state.py index 180e642..cd36edd 100755 --- a/nfs4.0/nfs4state.py +++ b/nfs4.0/nfs4state.py @@ -5,10 +5,9 @@ import nfs4acl import nfs4lib import os, time, array, random, string try: - import cStringIO - StringIO = cStringIO + import cStringIO.StringIO as StringIO except: - import StringIO + from io import StringIO from stat import * import sha diff --git a/nfs4.1/fs.py b/nfs4.1/fs.py index e2c7eca..e8d413e 100644 --- a/nfs4.1/fs.py +++ b/nfs4.1/fs.py @@ -6,7 +6,10 @@ from nfs4lib import NFS4Error import struct import logging from locking import Lock, RWLock -from cStringIO import StringIO +try: + import cStringIO.StringIO as StringIO +except: + from io import StringIO import time from xdrdef.nfs4_pack import NFS4Packer diff --git a/xdr/xdrgen.py b/xdr/xdrgen.py index 0aa1a52..8856b4c 100755 --- a/xdr/xdrgen.py +++ b/xdr/xdrgen.py @@ -215,7 +215,10 @@ import sys import keyword -import StringIO +try: + import cStringIO.StringIO as StringIO +except: + from io import StringIO import time import os # Allow to be run stright from package