diff mbox

[3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax"

Message ID 1450346791-25562-4-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Dec. 17, 2015, 10:06 a.m. UTC 
This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/tracetool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Blake Dec. 17, 2015, 5:28 p.m. UTC | #1 
On 12/17/2015 03:06 AM, Markus Armbruster wrote:
> This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  scripts/tracetool.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Might be nice to mention fec21036 as the reason why we can revert.

Reviewed-by: Eric Blake <eblake@redhat.com>
Markus Armbruster Dec. 17, 2015, 6:37 p.m. UTC | #2 
Eric Blake <eblake@redhat.com> writes:

> On 12/17/2015 03:06 AM, Markus Armbruster wrote:
>> This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5.
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  scripts/tracetool.py | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Might be nice to mention fec21036 as the reason why we can revert.

What about:

    We require Python 2.6 now (commit fec2103).

> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks!
Eric Blake Dec. 17, 2015, 7:59 p.m. UTC | #3 
On 12/17/2015 11:37 AM, Markus Armbruster wrote:
> Eric Blake <eblake@redhat.com> writes:
> 
>> On 12/17/2015 03:06 AM, Markus Armbruster wrote:
>>> This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5.
>>>
>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> ---
>>>  scripts/tracetool.py | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> Might be nice to mention fec21036 as the reason why we can revert.
> 
> What about:
> 
>     We require Python 2.6 now (commit fec2103).

Yes, that makes this commit a lot more meaningful.

> 
>> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> Thanks!
>
diff mbox

Patch

diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 83bde7b..7b82959 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -71,7 +71,7 @@  def main(args):
 
     try:
         opts, args = getopt.getopt(args[1:], "", long_opts)
-    except getopt.GetoptError, err:
+    except getopt.GetoptError as err:
         error_opt(str(err))
 
     check_backends = False
@@ -132,7 +132,7 @@  def main(args):
     try:
         tracetool.generate(sys.stdin, arg_format, arg_backends,
                            binary=binary, probe_prefix=probe_prefix)
-    except tracetool.TracetoolError, e:
+    except tracetool.TracetoolError as e:
         error_opt(str(e))
 
 if __name__ == "__main__":