Use print() function in both Python 2 and Python 3

https://github.com/thom311/libnl/pull/327

4 files changed, 10 insertions, 12 deletions

diff --git a/python/netlink/core.py b/python/netlink/core.py
index e5864cf..1a8ea8f 100644
--- a/python/netlink/core.py
+++ b/python/netlink/core.py
@@ -127,7 +127,7 @@ class Message(object):
         capi.nlmsg_free(self._msg)
 
     def __len__(self):
-        return capi.nlmsg_len(nlmsg_hdr(self._msg))
+        return capi.nlmsg_len(capi.nlmsg_hdr(self._msg))
 
     @property
     def protocol(self):
diff --git a/python/netlink/route/link.py b/python/netlink/route/link.py
index 5ec14b2..e3a6bd3 100644
--- a/python/netlink/route/link.py
+++ b/python/netlink/route/link.py
@@ -40,7 +40,6 @@ __version__ = '0.1'
 __all__ = [
     'LinkCache',
     'Link',
-    'get_from_kernel',
 ]
 
 import socket
@@ -159,7 +158,7 @@ class Link(netlink.Object):
         if exc_type is None:
             self.change()
         else:
-            return false
+            return False
 
     @classmethod
     def from_capi(cls, obj):
diff --git a/python/netlink/route/links/bridge.py b/python/netlink/route/links/bridge.py
index 549b092..cf4e764 100644
--- a/python/netlink/route/links/bridge.py
+++ b/python/netlink/route/links/bridge.py
@@ -7,6 +7,7 @@
 """
 
 from __future__ import absolute_import
+from __future__ import print_function
 
 from ... import core as netlink
 from ..  import capi as capi
@@ -19,10 +20,10 @@ class BRIDGELink(object):
 
     def bridge_assert_ext_info(self):
         if self._has_ext_info == False:
-            print """
+            print("""
             Please update your kernel to be able to call this method.
             Your current kernel bridge version is too old to support this extention.
-            """
+            """)
             raise RuntimeWarning()
 
     def port_state2str(self, state):
@@ -51,12 +52,12 @@ class BRIDGELink(object):
     def priority(self):
         """bridge prio
         """
-        bridge_assert_ext_info()
+        self.bridge_assert_ext_info()
         return capi.rtnl_link_bridge_get_prio(self._link)
 
     @priority.setter
     def priority(self, prio):
-        bridge_assert_ext_info()
+        self.bridge_assert_ext_info()
         if prio < 0 or prio >= 2**16:
             raise ValueError()
         capi.rtnl_link_bridge_set_prio(self._link, int(prio))
@@ -66,12 +67,12 @@ class BRIDGELink(object):
     def cost(self):
         """bridge prio
         """
-        bridge_assert_ext_info()
+        self.bridge_assert_ext_info()
         return capi.rtnl_link_bridge_get_cost(self._link)
 
     @cost.setter
     def cost(self, cost):
-        bridge_assert_ext_info()
+        self.bridge_assert_ext_info()
         if cost < 0 or cost >= 2**32:
             raise ValueError()
         capi.rtnl_link_bridge_set_cost(self._link, int(cost))
diff --git a/python/netlink/route/links/inet.py b/python/netlink/route/links/inet.py
index f5f45cb..d4de07b 100644
--- a/python/netlink/route/links/inet.py
+++ b/python/netlink/route/links/inet.py
@@ -8,9 +8,7 @@
 
 from __future__ import absolute_import
 
-__all__ = [
-    '',
-]
+__all__ = []
 
 from ... import core as netlink
 from ..  import capi as capi