Introduce Python's absolute_imports

Helps greatly when porting to Python 3

diff --git a/python/netlink/core.py b/python/netlink/core.py
index e311d5ff47c8bcb6999f3eeaa10040975b410942..26ea6cabbd72f50e9612d8b3a151cf64eef73aa9 100644 (file)
--- a/python/netlink/core.py
+++ b/python/netlink/core.py
@@ -25,8 +25,11 @@ The following exceptions are defined:
 All other classes or functions in this module are considered implementation
 details.
 """
+from __future__ import absolute_import
 
-import capi
+
+
+from . import capi
 import sys
 import socket
 import struct

diff --git a/python/netlink/route/address.py b/python/netlink/route/address.py
index 36548349e8009d8e058a896d19fc97538c363717..29b80728838b074ad7db7059abbf7167c670d431 100644 (file)
--- a/python/netlink/route/address.py
+++ b/python/netlink/route/address.py
@@ -5,17 +5,20 @@
 """Module providing access to network addresses
 """
 
+from __future__ import absolute_import
+
+
 __version__ = "1.0"
 __all__ = [
        'AddressCache',
        'Address']
 
 import datetime
-import netlink.core as netlink
-import netlink.capi as core_capi
-import netlink.route.capi as capi
-import netlink.route.link as Link
-import netlink.util as util
+from .. import core as netlink
+from .. import capi as core_capi
+from .  import capi as capi
+from .  import link as Link
+from .. import util as util
 
 ###########################################################################
 # Address Cache

diff --git a/python/netlink/route/link.py b/python/netlink/route/link.py
index 3a428c9a85c66f7c8c7e33c70f9191c64a776dee..fce2cd7b846c4127222f37030287a14a7f777ad8 100644 (file)
--- a/python/netlink/route/link.py
+++ b/python/netlink/route/link.py
@@ -34,6 +34,8 @@ The following public functions exist:
 
 """
 
+from __future__ import absolute_import
+
 __version__ = "0.1"
 __all__ = [
        'LinkCache',
@@ -42,11 +44,11 @@ __all__ = [
 
 import socket
 import sys
-import netlink.core as netlink
-import netlink.capi as core_capi
-import netlink.route.capi as capi
-import netlink.route.links.inet as inet
-import netlink.util as util
+from .. import core as netlink
+from .. import capi as core_capi
+from .  import capi as capi
+from .links  import inet as inet
+from .. import util as util
 
 ###########################################################################
 # Link statistics definitions

diff --git a/python/netlink/route/links/dummy.py b/python/netlink/route/links/dummy.py
index 82104131782cb13628fe480b74aec959941ffff4..6c96617c87aee4b8fcec2294872e3ed208322656 100644 (file)
--- a/python/netlink/route/links/dummy.py
+++ b/python/netlink/route/links/dummy.py
@@ -5,13 +5,14 @@
 """Dummy
 
 """
+from __future__ import absolute_import
 
 __version__ = "1.0"
 __all__ = ['init']
 
-import netlink.core as netlink
-import netlink.route.capi as capi
 
+from ... import core as netlink
+from ..  import capi as capi
 class DummyLink(object):
        def __init__(self, link):
                self._rtnl_link = link

diff --git a/python/netlink/route/links/inet.py b/python/netlink/route/links/inet.py
index 63c234f600a26e708d4691b5557d89ff34016ad1..73bde6bb0c03917bf2c7f0f4471b34552fb1d294 100644 (file)
--- a/python/netlink/route/links/inet.py
+++ b/python/netlink/route/links/inet.py
@@ -6,12 +6,13 @@
 
 """
 
-__all__ = ['']
+from __future__ import absolute_import
 
-import netlink.core as netlink
-import netlink.route.capi as capi
-import netlink.util as util
+__all__ = ['']
 
+from ... import core as netlink
+from ..  import capi as capi
+from ... import util as util
 DEVCONF_FORWARDING = 1
 DEVCONF_MC_FORWARDING = 2
 DEVCONF_PROXY_ARP = 3

diff --git a/python/netlink/route/links/vlan.py b/python/netlink/route/links/vlan.py
index 7f282474f695afd42f95ac82b9e466460542289f..134e7211ebaadcf88c64819f0651303d7bd60230 100644 (file)
--- a/python/netlink/route/links/vlan.py
+++ b/python/netlink/route/links/vlan.py
@@ -6,9 +6,11 @@
 
 """
 
-import netlink.core as netlink
-import netlink.route.capi as capi
+from __future__ import absolute_import
 
+
+from ... import core as netlink
+from ..  import capi as capi
 class VLANLink(object):
        def __init__(self, link):
                self._link = link

diff --git a/python/netlink/route/qdisc/htb.py b/python/netlink/route/qdisc/htb.py
index 13e10f2673e4ae05403182fc11b5558513b0e17f..23c7f751902a1e446fdc344d4c1a2a15a56392fb 100644 (file)
--- a/python/netlink/route/qdisc/htb.py
+++ b/python/netlink/route/qdisc/htb.py
@@ -6,10 +6,12 @@
 
 """
 
-import netlink.core as netlink
-import netlink.util as util
-import netlink.route.capi as capi
-import netlink.route.tc as tc
+from __future__ import absolute_import
+
+from ... import core as netlink
+from ... import util as util
+from ..  import capi as capi
+from ..  import tc as tc
 
 class HTBQdisc(object):
        def __init__(self, qdisc):

diff --git a/python/netlink/route/tc.py b/python/netlink/route/tc.py
index bae9bca2781e186460b11994874814652e632e12..0d20e795c36992ab4b6bfefc10426e47e603ecb7 100644 (file)
--- a/python/netlink/route/tc.py
+++ b/python/netlink/route/tc.py
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2011 Thomas Graf <tgraf@suug.ch>
 #
+from __future__ import absolute_import
 
 __all__ = [
        'TcCache',
@@ -12,12 +13,11 @@ __all__ = [
 
 import socket
 import sys
-import netlink.core as netlink
-import netlink.capi as core_capi
-import netlink.route.capi as capi
-import netlink.util as util
-
-import netlink.route.link as Link
+from .. import core as netlink
+from .. import capi as core_capi
+from .  import capi as capi
+from .. import util as util
+from .  import link as Link
 
 TC_PACKETS = 0
 TC_BYTES = 1

diff --git a/python/netlink/util.py b/python/netlink/util.py
index 191c531a22d210547a92a0b5efc2e84f44304ae5..0a73db4aca23eab119ae421f706e08a13f2c14fe 100644 (file)
--- a/python/netlink/util.py
+++ b/python/netlink/util.py
@@ -8,8 +8,10 @@
 
 """
 
-import netlink.core as netlink
-import netlink.capi as capi
+from __future__ import absolute_import
+
+from . import core as netlink
+from . import capi as capi
 from string import Formatter
 
 __version__ = "1.0"