[ovs-dev] [PATCH] ovs-dpctl-top: python3 compatibility

[Flavio Leitner]

On Mon, Mar 02, 2020 at 11:05:06AM -0500, Aaron Conole wrote:
> During the transition to python3 support, some syntax errors weren't
> adequately cleaned.  This addresses the various errors, plus one
> minor issue with string type conversion.
> 
> Signed-off-by: Aaron Conole <aconole at redhat.com>

Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1809184
Tested-by: Flavio Leitner <fbl at sysclose.org>
Acked-by: Flavio Leitner <fbl at sysclose.org>

Please apply to branch-2.13 as well.

Thanks,
fbl


> ---
> 
> 
> diff --git a/utilities/ovs-dpctl-top.in b/utilities/ovs-dpctl-top.in
> index f2cc3f7f2a..011cc64b74 100755
> --- a/utilities/ovs-dpctl-top.in
> +++ b/utilities/ovs-dpctl-top.in
> @@ -592,7 +592,7 @@ def flows_read(ihdl, flow_db):
>  
>          try:
>              flow_db.flow_line_add(line)
> -        except ValueError, arg:
> +        except ValueError as arg:
>              logging.error(arg)
>  
>      return flow_db
> @@ -958,6 +958,9 @@ class FlowDB:
>          change order of fields of the same flow.
>          """
>  
> +        if not isinstance(line, str):
> +           line = str(line)
> +
>          line = line.rstrip("\n")
>          (fields, stats, _) = flow_line_split(line)
>  
> @@ -988,7 +991,7 @@ class FlowDB:
>  
>              self.flow_event(fields_dict, stats_old_dict, stats_dict)
>  
> -        except ValueError, arg:
> +        except ValueError as arg:
>              logging.error(arg)
>              self._error_count += 1
>              raise
> @@ -1192,7 +1195,7 @@ def flows_top(args):
>                          flows_read(ihdl, flow_db)
>                      finally:
>                          ihdl.close()
> -                except OSError, arg:
> +                except OSError as arg:
>                      logging.critical(arg)
>                      break
>  
> @@ -1220,7 +1223,7 @@ def flows_top(args):
>  
>      # repeat output
>      for (count, line) in lines:
> -        print line
> +        print(line)
>  
>  
>  def flows_script(args):
> @@ -1249,7 +1252,7 @@ def flows_script(args):
>      render = Render(console_width, Render.FIELD_SELECT_SCRIPT)
>  
>      for line in render.format(flow_db):
> -        print line
> +        print(line)
>  
>  
>  def main():
> ---
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

-- 
fbl