[pygobject] Move Python glib options module into gi package

[Simon Feltman <sfeltman src gnome org>]

commit 8afd7e880a72a44e6ea46c763bab82146fd75c96
Author: Simon Feltman <sfeltman src gnome org>
Date:   Wed Jan 8 19:22:08 2014 -0800

    Move Python glib options module into gi package
    
    Move gi/_glib/option.py into gi/_option.py. Remove gi/_glib since it is no
    longer needed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=712197

 Makefile.am                        |    3 ++-
 configure.ac                       |    1 -
 gi/Makefile.am                     |    1 -
 gi/_glib/Makefile.am               |   21 ---------------------
 gi/_glib/__init__.py               |   20 --------------------
 gi/{_glib/option.py => _option.py} |    2 +-
 gi/overrides/GLib.py               |    2 +-
 gi/overrides/GObject.py            |    2 +-
 8 files changed, 5 insertions(+), 47 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1c74126..b0623ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,8 @@ nobase_pyexec_PYTHON = \
        gi/docstring.py \
        gi/_constants.py \
        gi/_propertyhelper.py \
-       gi/_signalhelper.py
+       gi/_signalhelper.py \
+       gi/_option.py
 
 # if we build in a separate tree, we need to symlink the *.py files from the
 # source tree; Python does not accept the extensions and modules in different
diff --git a/configure.ac b/configure.ac
index 95ad3a9..d9e4661 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,7 +268,6 @@ AC_CONFIG_FILES(
   gi/Makefile
   gi/repository/Makefile
   gi/overrides/Makefile
-  gi/_glib/Makefile
   gi/_gobject/Makefile
   examples/Makefile
   tests/Makefile
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 354f407..2d4d194 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = \
        repository \
        overrides \
-        _glib \
        _gobject
 
 extension_cppflags = \
diff --git a/gi/_glib/option.py b/gi/_option.py
similarity index 99%
rename from gi/_glib/option.py
rename to gi/_option.py
index b4d3050..0649081 100644
--- a/gi/_glib/option.py
+++ b/gi/_option.py
@@ -33,7 +33,7 @@ import sys
 import optparse
 from optparse import OptParseError, OptionError, OptionValueError, \
     BadOptionError, OptionConflictError
-from ..module import get_introspection_module
+from .module import get_introspection_module
 
 if sys.version_info >= (3, 0):
     _basestring = str
diff --git a/gi/overrides/GLib.py b/gi/overrides/GLib.py
index 73a2567..b17c69b 100644
--- a/gi/overrides/GLib.py
+++ b/gi/overrides/GLib.py
@@ -33,7 +33,7 @@ GLib = get_introspection_module('GLib')
 
 __all__ = []
 
-from gi._glib import option
+from gi import _option as option
 option  # pyflakes
 __all__.append('option')
 
diff --git a/gi/overrides/GObject.py b/gi/overrides/GObject.py
index fe172ca..8c22ac5 100644
--- a/gi/overrides/GObject.py
+++ b/gi/overrides/GObject.py
@@ -41,7 +41,7 @@ GObjectModule = gi.module.get_introspection_module('GObject')
 __all__ = []
 
 
-from gi._glib import option
+from gi import _option as option
 sys.modules['gi._gobject.option'] = option