From 84d247ea75ec8d342821329b2a2e0ac6789fdcec Mon Sep 17 00:00:00 2001 From: Satoshi Kobayashi Date: Tue, 14 Apr 2015 13:18:19 +0900 Subject: [PATCH] 'reduce' has been renamed to 'functools.reduce' in Python 3 Signed-off-by: Satoshi Kobayashi Signed-off-by: FUJITA Tomonori --- ryu/lib/packet/bgp.py | 7 +++++++ ryu/lib/packet/ospf.py | 7 +++++++ 2 files changed, 14 insertions(+) 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