Imported Upstream version 3.13.4

Change-Id: If8453fcd54aeed1d4cec58fcabaf92a68d0efbb5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 22 insertions, 3 deletions

diff --git a/gi/__init__.py b/gi/__init__.py
index df6843c..fe4abcf 100644
--- a/gi/__init__.py
+++ b/gi/__init__.py
@@ -27,12 +27,17 @@ __path__ = extend_path(__path__, __name__)
 import sys
 import os
 import importlib
+import types
+
+_static_binding_error = ('When using gi.repository you must not import static '
+                         'modules like "gobject". Please change all occurrences '
+                         'of "import gobject" to "from gi.repository import GObject". '
+                         'See: https://bugzilla.gnome.org/show_bug.cgi?id=709183')
 
 # we can't have pygobject 2 loaded at the same time we load the internal _gobject
 if 'gobject' in sys.modules:
-    raise ImportError('When using gi.repository you must not import static '
-                      'modules like "gobject". Please change all occurrences '
-                      'of "import gobject" to "from gi.repository import GObject".')
+    raise ImportError(_static_binding_error)
+
 
 from . import _gi
 from ._gi import _gobject
@@ -50,6 +55,20 @@ version_info = _gobject.pygobject_version[:]
 __version__ = "{0}.{1}.{2}".format(*version_info)
 
 
+class _DummyStaticModule(types.ModuleType):
+    __path__ = None
+
+    def __getattr__(self, name):
+        raise AttributeError(_static_binding_error)
+
+
+sys.modules['glib'] = _DummyStaticModule('glib', _static_binding_error)
+sys.modules['gobject'] = _DummyStaticModule('gobject', _static_binding_error)
+sys.modules['gio'] = _DummyStaticModule('gio', _static_binding_error)
+sys.modules['gtk'] = _DummyStaticModule('gtk', _static_binding_error)
+sys.modules['gtk.gdk'] = _DummyStaticModule('gtk.gdk', _static_binding_error)
+
+
 def check_version(version):
     if isinstance(version, str):
         version_list = tuple(map(int, version.split(".")))