[ovs-git] [openvswitch/ovs] 73eb68: python: Fix xmlrpclib imports.

GitHub noreply at github.com
Wed Jan 20 21:46:12 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 73eb682edb67f44aead7f2c70e9e8777e87df898
      https://github.com/openvswitch/ovs/commit/73eb682edb67f44aead7f2c70e9e8777e87df898
  Author: Russell Bryant <russell at ovn.org>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M INSTALL.md
    M debian/control
    M m4/openvswitch.m4
    M python/ovstest/rpcserver.py
    M python/ovstest/util.py
    M rhel/openvswitch-fedora.spec.in
    M rhel/openvswitch.spec.in

  Log Message:
  -----------
  python: Fix xmlrpclib imports.

Fix imports of xmlrpclib to be compatible with Python 3.  Python 2 had
xmlrpclib (client) and SimpleXMLRPCServer (server).  In Python 3, these
have been renamed to xmlrpc.client and xmlrpc.server.

The solution implemented here is to use the six library.  It may seem
excessive for this particular issue, but the six library provides
helpers for Python 2 and 3 compatibility for many different issues.
This is just the first of many uses of the six library.

Signed-off-by: Russell Bryant <russell at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: b3ac29477d493d9442f39c734a0a9ebaa223c308
      https://github.com/openvswitch/ovs/commit/b3ac29477d493d9442f39c734a0a9ebaa223c308
  Author: Russell Bryant <russell at ovn.org>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M debian/ovs-monitor-ipsec
    M python/ovs/json.py
    M python/ovs/ovsuuid.py
    M python/ovs/socket_util.py
    M python/ovs/unixctl/server.py
    M python/ovs/vlog.py
    M python/ovstest/util.py
    M tests/test-vlog.py
    M vtep/ovs-vtep

  Log Message:
  -----------
  python: Stop using xrange().

Python 2 had range() and xrange().  xrange() is more efficient, but
behaves differently so range() was retained for compatibility.  Python 3
only has range() and it behaves like Python 2's xrange().

Remove explicit use of xrange() and use six.moves.range() to
make sure we're using xrange() from Python 2 or range() from Python 3.

Signed-off-by: Russell Bryant <russell at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: 56ec061192e3fe1590fe9e36e55080284d73f238
      https://github.com/openvswitch/ovs/commit/56ec061192e3fe1590fe9e36e55080284d73f238
  Author: Russell Bryant <russell at ovn.org>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M Makefile.am
    M debian/ovs-monitor-ipsec

  Log Message:
  -----------
  python: Fix octal compatibility.

Octal constants must be written as 0o077 instead of 0077 to be
compatible with both Python 2 and 3.

Signed-off-by: Russell Bryant <russell at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/0a96a21b6ee6...56ec061192e3


More information about the git mailing list