Use relative imports for the gdbus/codegen package

But not yet for the config module (but is taken care
of in a followup patch).

https://bugzilla.gnome.org/show_bug.cgi?id=650763

diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
index 825bb48..9775536 100644 (file)
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -24,8 +24,8 @@
 import sys
 
 import config
-import utils
-import dbustypes
+from . import utils
+from . import dbustypes
 
 # ----------------------------------------------------------------------------------------------------
 

diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
index 87eb3e5..a2fb118 100644 (file)
--- a/gio/gdbus-2.0/codegen/codegen_docbook.py
+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
@@ -25,9 +25,9 @@ import sys
 import re
 
 import config
-import utils
-import dbustypes
-import parser
+from . import utils
+from . import dbustypes
+from . import parser
 
 # ----------------------------------------------------------------------------------------------------
 

diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
index cc9298f..f11ef1d 100755 (executable)
--- a/gio/gdbus-2.0/codegen/codegen_main.py
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
@@ -25,11 +25,11 @@ import sys
 import optparse
 
 import config
-import utils
-import dbustypes
-import parser
-import codegen
-import codegen_docbook
+from . import utils
+from . import dbustypes
+from . import parser
+from . import codegen
+from . import codegen_docbook
 
 def find_arg(arg_list, arg_name):
     for a in arg_list:

diff --git a/gio/gdbus-2.0/codegen/dbustypes.py b/gio/gdbus-2.0/codegen/dbustypes.py
index 277e346..212b534 100644 (file)
--- a/gio/gdbus-2.0/codegen/dbustypes.py
+++ b/gio/gdbus-2.0/codegen/dbustypes.py
@@ -21,7 +21,7 @@
 #
 # Author: David Zeuthen <davidz@redhat.com>
 
-import utils
+from . import utils
 
 class Annotation:
     def __init__(self, key, value):

diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
index a324006..5fabd44 100644 (file)
--- a/gio/gdbus-2.0/codegen/parser.py
+++ b/gio/gdbus-2.0/codegen/parser.py
@@ -21,11 +21,11 @@
 #
 # Author: David Zeuthen <davidz@redhat.com>
 
-import dbustypes
-
 import sys
 import xml.parsers.expat
 
+from . import dbustypes
+
 class DBusXMLParser:
     STATE_TOP = 'top'
     STATE_NODE = 'node'