diff options
| author | Russell Bryant <russell@ovn.org> | 2015-12-14 14:03:14 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-01-20 16:43:15 -0500 |
| commit | 73eb682edb67f44aead7f2c70e9e8777e87df898 (patch) | |
| tree | a00ec92b3064f258eee85340e8c9b4f26dc93c25 /rhel | |
| parent | 0a96a21b6ee67d7cde2abd72a3a5bd290ac618d5 (diff) | |
| download | openvswitch-73eb682edb67f44aead7f2c70e9e8777e87df898.tar.gz | |
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@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/openvswitch-fedora.spec.in | 3 | ||||
| -rw-r--r-- | rhel/openvswitch.spec.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 15f5c6082..e65566553 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -41,7 +41,7 @@ Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz BuildRequires: autoconf automake libtool BuildRequires: systemd-units openssl openssl-devel -BuildRequires: python python-twisted-core python-zope-interface PyQt4 +BuildRequires: python python-twisted-core python-zope-interface PyQt4 python-six BuildRequires: desktop-file-utils BuildRequires: groff graphviz # make check dependencies @@ -71,6 +71,7 @@ Summary: Open vSwitch python bindings License: ASL 2.0 BuildArch: noarch Requires: python +Requires: python-six %description -n python-openvswitch Python bindings for the Open vSwitch database diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index fdb187936..a1f9b1878 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -22,7 +22,7 @@ License: ASL 2.0 Release: 1 Source: openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm -Requires: logrotate, python >= 2.7 +Requires: logrotate, python >= 2.7, python-six BuildRequires: openssl-devel %bcond_without check |