From: Gary Lin <glin@suse.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>
Subject: Re: [PATCH v3 02/20] BaseTools: Refactor python except statements
Date: Thu, 21 Jun 2018 14:27:45 +0800 [thread overview]
Message-ID: <20180621062745.bldlgsc6mige5e4s@GaryWorkstation> (raw)
In-Reply-To: <20180621044346.28495-3-glin@suse.com>
On Thu, Jun 21, 2018 at 12:43:28PM +0800, Gary Lin wrote:
> Convert "except ... ," to "except ... as" to be compatible with python3.
> Based on "futurize -f lib2to3.fixes.fix_except"
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
>
-->8--
> - except IOError as (errno, strerror):
> + except IOError as xxx_todo_changeme:
> + (errno, strerror) = xxx_todo_changeme.args
> file_list.close()
> if not Opt.silent:
> sys.stderr.write("I/O ERROR : %s : %s\n" % (str(errno), strerror))
> @@ -100,7 +101,8 @@ def ShellCommandResults(CmdLine, Opt):
> sys.stderr.flush()
> returnValue = errno
>
> - except OSError as (errno, strerror):
> + except OSError as xxx_todo_changeme1:
> + (errno, strerror) = xxx_todo_changeme1.args
> file_list.close()
> if not Opt.silent:
> sys.stderr.write("OS ERROR : %s : %s\n" % (str(errno), strerror))
> @@ -210,13 +212,15 @@ def RevertCmd(Filename, Opt):
> sys.stderr.write("Subprocess ERROR : %s\n" % err_val)
> sys.stderr.flush()
>
> - except IOError as (errno, strerror):
> + except IOError as xxx_todo_changeme2:
> + (errno, strerror) = xxx_todo_changeme2.args
> if not Opt.silent:
> sys.stderr.write("I/O ERROR : %d : %s\n" % (str(errno), strerror))
> sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)
> sys.stderr.flush()
>
> - except OSError as (errno, strerror):
> + except OSError as xxx_todo_changeme3:
> + (errno, strerror) = xxx_todo_changeme3.args
> if not Opt.silent:
> sys.stderr.write("OS ERROR : %d : %s\n" % (str(errno), strerror))
> sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)
I forgot to fix the naming of the tuple arguments. Will post a new patch
if necessary.
Gary Lin
next prev parent reply other threads:[~2018-06-21 6:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 4:43 [PATCH v3 00/20] BaseTools: One step toward python3 Gary Lin
2018-06-21 4:43 ` [PATCH v3 01/20] BaseTools: Fix a typo in ini.py Gary Lin
2018-06-21 15:46 ` Carsey, Jaben
2018-06-21 4:43 ` [PATCH v3 02/20] BaseTools: Refactor python except statements Gary Lin
2018-06-21 6:27 ` Gary Lin [this message]
2018-06-21 4:43 ` [PATCH v3 03/20] BaseTools: Refactor python print statements Gary Lin
2018-06-21 4:43 ` [PATCH v3 04/20] BaseTools: Remove the old python "not-equal" Gary Lin
2018-06-21 4:43 ` [PATCH v3 05/20] BaseTools: Use the python3-range functions Gary Lin
2018-06-21 12:40 ` Zhu, Yonghong
2018-06-22 2:04 ` Gary Lin
2018-06-22 5:29 ` Zhu, Yonghong
2018-06-22 8:21 ` Gary Lin
2018-06-22 8:45 ` Gary Lin
2018-06-22 8:53 ` Zhu, Yonghong
2018-06-22 9:13 ` Gary Lin
2018-06-22 9:22 ` Zhu, Yonghong
2018-06-22 9:24 ` Zhu, Yonghong
2018-06-22 9:48 ` Gary Lin
2018-06-22 10:22 ` Zhu, Yonghong
2018-06-25 3:34 ` Gary Lin
2018-06-25 5:58 ` Zhu, Yonghong
2018-06-25 6:18 ` Gary Lin
2018-06-21 4:43 ` [PATCH v3 06/20] BaseTools: Remove tuple parameter in python scripts Gary Lin
2018-06-21 4:43 ` [PATCH v3 07/20] BaseTools: Remove the deprecated hash_key() Gary Lin
2018-06-21 4:43 ` [PATCH v3 08/20] BaseTools: Replace StandardError with Expression Gary Lin
2018-06-21 4:43 ` [PATCH v3 09/20] BaseTools: Remove types.TypeType Gary Lin
2018-06-21 4:43 ` [PATCH v3 10/20] BaseTools: Refactor python raise statement Gary Lin
2018-06-21 4:43 ` [PATCH v3 11/20] BaseTools: Adjust the spaces around commas and colons Gary Lin
2018-06-21 4:43 ` [PATCH v3 12/20] BaseTools: Migrate to the new octal literal Gary Lin
2018-06-21 4:43 ` [PATCH v3 13/20] BaseTools: Unify long int and int in python scripts Gary Lin
2018-06-21 4:43 ` [PATCH v3 14/20] BaseTools: Fix old python2 idioms Gary Lin
2018-06-21 4:43 ` [PATCH v3 15/20] BaseTools: Replace StringIO.StringIO with io.BytesIO Gary Lin
2018-06-21 4:43 ` [PATCH v3 16/20] BaseTools: Treat GenFds.py and build.py as python modules Gary Lin
2018-06-21 4:43 ` [PATCH v3 17/20] BaseTools: Adopt absolute import for python scripts Gary Lin
2018-06-21 4:43 ` [PATCH v3 18/20] BaseTools: Move OverrideAttribs to OptRomInfStatement.py Gary Lin
2018-06-21 4:43 ` [PATCH v3 19/20] BaseTools: Move FindExtendTool to GenFdsGlobalVariable.py Gary Lin
2018-06-21 4:43 ` [PATCH v3 20/20] BaseTools: Move ImageBinDict " Gary Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180621062745.bldlgsc6mige5e4s@GaryWorkstation \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox