]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Metaclass Python 3.x Compatibility
authorSteven Gonzales <stevendgonzales@gmail.com>
Mon, 12 May 2014 14:51:13 +0000 (07:51 -0700)
committerSteven Gonzales <stevendgonzales@gmail.com>
Wed, 21 May 2014 18:01:41 +0000 (13:01 -0500)
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

neutron/services/vpn/device_drivers/cisco_ipsec.py

index c4e98b528e5f2554b14c90eab987b048271e8cc5..0849761c7a270921fc32cfd92e89dd758809f817 100644 (file)
@@ -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