imports to gi.repository

14 files changed, 49 insertions, 41 deletions

diff --git a/aplay.py b/aplay.py
index fd6aaee..40820b5 100644
--- a/aplay.py
+++ b/aplay.py
@@ -11,8 +11,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import gst
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
 import os
 import logging
 import constants
diff --git a/button.py b/button.py
index 3879d32..156abff 100644
--- a/button.py
+++ b/button.py
@@ -1,5 +1,6 @@
-import gobject
-import gtk
+import gi
+from gi.repository import GObject
+from gi.repository import Gtk
 from gettext import gettext as _
 
 from sugar3.graphics.palette import Palette
diff --git a/collab.py b/collab.py
index 8b6d5c3..4ca906d 100644
--- a/collab.py
+++ b/collab.py
@@ -1,8 +1,8 @@
 import logging
 import xml.dom.minidom
 import os
-
-import gobject
+import gi
+from gi.repository import GObject
 import telepathy
 import telepathy.client
 
diff --git a/glive.py b/glive.py
index 71aa226..7242762 100644
--- a/glive.py
+++ b/glive.py
@@ -22,12 +22,11 @@ import os
 from gettext import gettext as _
 import time
 
-import gtk
-import gst
-import pygst
-pygst.require('0.10')
-import gobject
-gobject.threads_init()
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import Gst
 
 from sugar3.activity.activity import get_bundle_path
 import logging
diff --git a/gplay.py b/gplay.py
index 168fb22..b50b038 100644
--- a/gplay.py
+++ b/gplay.py
@@ -18,11 +18,11 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-import gobject
-gobject.threads_init()
-import pygst
-pygst.require('0.10')
-import gst
+import gi
+gi.require_version('Gst', '1.0')
+
+from gi.repository import GObject
+from gi.repository import Gst
 
 import logging
 logger = logging.getLogger('record:gplay.py')
diff --git a/iconcombobox.py b/iconcombobox.py
index a7cfdc4..0a92e6e 100644
--- a/iconcombobox.py
+++ b/iconcombobox.py
@@ -18,7 +18,8 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-import gtk
+import gi
+from gi.repository import Gtk
 
 from sugar3.graphics.combobox import ComboBox
 from sugar3.graphics import style
diff --git a/mediaview.py b/mediaview.py
index 01567ff..45197ba 100644
--- a/mediaview.py
+++ b/mediaview.py
@@ -1,9 +1,9 @@
 import os
 from gettext import gettext as _
 
-import gobject
-import gtk
-from gtk import gdk
+from gi.repository import GObject
+from gi.repository import Gtk
+from gi.repository import Gdk
 
 import constants
 import utils
diff --git a/model.py b/model.py
index 759cd7d..910be4f 100644
--- a/model.py
+++ b/model.py
@@ -26,9 +26,10 @@ import uuid
 import os
 import time
 import json
-
-import gobject
-import gst
+import gi
+from gi.repository import GObject
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
 
 import sugar3.profile
 import sugar3.env
diff --git a/record.py b/record.py
index a1cd5f2..d7d6d9d 100644
--- a/record.py
+++ b/record.py
@@ -23,15 +23,15 @@ import logging
 import shutil
 from gettext import gettext as _
 from gettext import ngettext
-
-import gtk
-from gtk import gdk
+import gi
+from gi.repository import Gtk
+from gi.repository import Gdk
 import cairo
-import pango
-import pangocairo
-import pygst
-pygst.require('0.10')
-import gst
+from gi.repository import Pango
+from gi.repository import PangoCairo
+
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
 
 from sugar3.activity import activity
 from sugar3.graphics.toolcombobox import ToolComboBox
diff --git a/recorded.py b/recorded.py
index 9296742..4f7200c 100644
--- a/recorded.py
+++ b/recorded.py
@@ -19,7 +19,8 @@
 #THE SOFTWARE.
 
 import os
-import gtk
+import gi
+from gi.repository import Gtk
 
 import constants
 from instance import Instance
diff --git a/recordtube.py b/recordtube.py
index c2a60bb..fac6f94 100644
--- a/recordtube.py
+++ b/recordtube.py
@@ -1,7 +1,7 @@
 import os
 import logging
-
-import gobject
+import gi
+from gi.repository import GObject
 from dbus.service import signal
 from dbus.gobject_service import ExportedGObject
 
diff --git a/serialize.py b/serialize.py
index 9cd7f40..0845dfb 100644
--- a/serialize.py
+++ b/serialize.py
@@ -1,7 +1,8 @@
 from xml.dom.minidom import getDOMImplementation
 import cStringIO
 import os
-import gtk
+import gi
+from gi.repository import Gtk
 import logging
 
 from sugar3.datastore import datastore
diff --git a/tray.py b/tray.py
index f8a4a2f..8124842 100644
--- a/tray.py
+++ b/tray.py
@@ -15,9 +15,11 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import gobject
-import gtk
-import hippo
+import gi
+from gi.repository import GObject
+from gi.repository import Gtk
+# FIXME: No more hippo
+#import hippo
 
 import sugar3
 from sugar3.graphics import style
diff --git a/utils.py b/utils.py
index 28adc9c..00c7554 100644
--- a/utils.py
+++ b/utils.py
@@ -1,8 +1,9 @@
+import gi
 import base64
-import rsvg
+from gi.repository import Rsvg
 import re
 import os
-import gtk
+from gi.repository import Gtk
 import time
 from time import strftime