diff options
| author | Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> | 2015-04-14 13:18:19 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-04-17 07:46:31 +0900 |
| commit | 84d247ea75ec8d342821329b2a2e0ac6789fdcec (patch) | |
| tree | e468675e2f03e3ee698105bbee3fcfce2cffd157 | |
| parent | 87a051889ee9afda1467b110da6178188b8d9ca5 (diff) | |
'reduce' has been renamed to 'functools.reduce' in Python 3
Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/lib/packet/bgp.py | 7 | ||||
| -rw-r--r-- | ryu/lib/packet/ospf.py | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ryu/lib/packet/bgp.py b/ryu/lib/packet/bgp.py index 84de1e12..03147486 100644 --- a/ryu/lib/packet/bgp.py +++ b/ryu/lib/packet/bgp.py @@ -29,6 +29,13 @@ import copy import netaddr import numbers +try: + # Python 3 + from functools import reduce +except ImportError: + # Python 2 + pass + from ryu.lib.stringify import StringifyMixin from ryu.lib.packet import afi as addr_family from ryu.lib.packet import safi as subaddr_family diff --git a/ryu/lib/packet/ospf.py b/ryu/lib/packet/ospf.py index d1ee33aa..1637e2db 100644 --- a/ryu/lib/packet/ospf.py +++ b/ryu/lib/packet/ospf.py @@ -19,6 +19,13 @@ RFC 2328 OSPF version 2 import struct +try: + # Python 3 + from functools import reduce +except ImportError: + # Python 2 + pass + from ryu.lib.stringify import StringifyMixin from ryu.lib.packet import packet_base from ryu.lib.packet import packet_utils |