From: Steven Gonzales <stevendgonzales@gmail.com>
Date: Mon, 12 May 2014 14:51:13 +0000 (-0700)
Subject: Metaclass Python 3.x Compatibility
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=14991ddf9ce7db3a7873b4aa5f8dfa5d61c9b1d9;p=openstack-build%2Fneutron-build.git

Metaclass Python 3.x Compatibility

According to the OpenStack style guide
(http://docs.openstack.org/developer/hacking/),
for Python 3.x compatibility use "six.add_metaclass"
instead of " __metaclass__."

Closes-Bug: #1236648
Change-Id: I2f507a90ee08cc05bd764549002a4656c187b6fc
---

diff --git a/neutron/services/vpn/device_drivers/cisco_ipsec.py b/neutron/services/vpn/device_drivers/cisco_ipsec.py
index c4e98b528..0849761c7 100644
--- a/neutron/services/vpn/device_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/device_drivers/cisco_ipsec.py
@@ -20,6 +20,7 @@ import requests
 
 import netaddr
 from oslo.config import cfg
+import six
 
 from neutron.common import exceptions
 from neutron.common import rpc as n_rpc
@@ -172,6 +173,7 @@ class CiscoCsrIPsecVpnDriverApi(proxy.RpcProxy):
                          topic=self.topic)
 
 
+@six.add_metaclass(abc.ABCMeta)
 class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
     """Cisco CSR VPN Device Driver for IPSec.
 
@@ -185,7 +187,6 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
     #   1.0 Initial version
 
     RPC_API_VERSION = '1.0'
-    __metaclass__ = abc.ABCMeta
 
     def __init__(self, agent, host):
         self.host = host