Remove gi._gi._gobject and gi._gobject modules

Expose everything from _gi._gobject in _gi instead.
This does not move any code around, just removes the module.

Also removes the gi._gobject package and replaces it
with a small dummy module in gi.__init__.py

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

1 files changed, 3 insertions, 5 deletions

diff --git a/tests/test_gobject.py b/tests/test_gobject.py
index 19ef03c0..c380d721 100644
--- a/tests/test_gobject.py
+++ b/tests/test_gobject.py
@@ -8,9 +8,7 @@ import warnings
 from gi.repository import GObject, GLib
 from gi import PyGIDeprecationWarning
 from gi.module import get_introspection_module
-
-import gi
-_gobject = gi._gi._gobject
+from gi import _gi
 
 import testhelper
 
@@ -27,9 +25,9 @@ class TestGObjectAPI(unittest.TestCase):
         # overrides.Object -> introspection.Object -> static.GObject
         GIObjectModule = get_introspection_module('GObject')
         self.assertTrue(issubclass(GObject.Object, GIObjectModule.Object))
-        self.assertTrue(issubclass(GIObjectModule.Object, _gobject.GObject))
+        self.assertTrue(issubclass(GIObjectModule.Object, _gi.GObject))
 
-        self.assertEqual(_gobject.GObject.__gtype__, GObject.TYPE_OBJECT)
+        self.assertEqual(_gi.GObject.__gtype__, GObject.TYPE_OBJECT)
         self.assertEqual(GIObjectModule.Object.__gtype__, GObject.TYPE_OBJECT)
         self.assertEqual(GObject.Object.__gtype__, GObject.TYPE_OBJECT)