From 46d2f1c532278bee5b5c8550d83d4ceb064ccc95 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sun, 16 Jul 2006 15:25:32 +0000
Subject: Get rid of pygtk.require. It doesn't make a lot of sense

and recent apps are not using it anyway.
---
(limited to 'sugar')

diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py
index 826c4cf..f510fde 100644
--- a/sugar/chat/Chat.py
+++ b/sugar/chat/Chat.py
@@ -6,9 +6,9 @@ import dbus
 import dbus.service
 import dbus.glib
 
-import pygtk
-pygtk.require('2.0')
-import gtk, gobject, pango
+import gtk
+import gobject
+import pango
 
 from sugar.chat.Emoticons import Emoticons
 from sugar.chat.ChatToolbar import ChatToolbar
diff --git a/sugar/chat/ChatEditor.py b/sugar/chat/ChatEditor.py
index e7761e2..46f85c9 100644
--- a/sugar/chat/ChatEditor.py
+++ b/sugar/chat/ChatEditor.py
@@ -1,5 +1,3 @@
-import pygtk
-pygtk.require('2.0')
 import gtk
 from gettext import gettext as _
 
diff --git a/sugar/chat/ChatToolbar.py b/sugar/chat/ChatToolbar.py
index d69cc55..b150fa6 100644
--- a/sugar/chat/ChatToolbar.py
+++ b/sugar/chat/ChatToolbar.py
@@ -1,5 +1,3 @@
-import pygtk
-pygtk.require('2.0')
 import gtk
 
 from sugar.chat.Emoticons import Emoticons
diff --git a/sugar/chat/richtext.py b/sugar/chat/richtext.py
index efd39c0..a60ca12 100644
--- a/sugar/chat/richtext.py
+++ b/sugar/chat/richtext.py
@@ -1,8 +1,4 @@
-#!/usr/bin/env python
-
-import pygtk
 import gobject
-pygtk.require('2.0')
 import gtk
 import pango
 import xml.sax
diff --git a/sugar/chat/sketchpad/SketchPad.py b/sugar/chat/sketchpad/SketchPad.py
index b040644..23ec5f3 100644
--- a/sugar/chat/sketchpad/SketchPad.py
+++ b/sugar/chat/sketchpad/SketchPad.py
@@ -1,5 +1,3 @@
-import pygtk
-pygtk.require('2.0')
 import gtk
 
 from Sketch import Sketch
diff --git a/sugar/chat/sketchpad/Toolbox.py b/sugar/chat/sketchpad/Toolbox.py
index 0b0605a..0292e1b 100644
--- a/sugar/chat/sketchpad/Toolbox.py
+++ b/sugar/chat/sketchpad/Toolbox.py
@@ -1,5 +1,3 @@
-import pygtk
-pygtk.require('2.0')
 import gtk
 import gobject
 
diff --git a/sugar/p2p/MostlyReliablePipe.py b/sugar/p2p/MostlyReliablePipe.py
index f9df98a..4c14020 100644
--- a/sugar/p2p/MostlyReliablePipe.py
+++ b/sugar/p2p/MostlyReliablePipe.py
@@ -10,9 +10,8 @@ import StringIO
 import binascii
 import random
 
-import pygtk
-pygtk.require('2.0')
-import gtk, gobject
+import gtk
+import gobject
 
 
 def _stringify_sha(sha_hash):
diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py
index c4dd0a5..b91cb7d 100644
--- a/sugar/presence/Buddy.py
+++ b/sugar/presence/Buddy.py
@@ -1,9 +1,8 @@
 import base64
 import logging
 
-import pygtk
-pygtk.require('2.0')
-import gtk, gobject
+import gtk
+import gobject
 
 from sugar.p2p import Stream
 from sugar.p2p import network
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py
index bda8fa9..f38fb08 100644
--- a/sugar/presence/PresenceService.py
+++ b/sugar/presence/PresenceService.py
@@ -627,7 +627,7 @@ def runTests():
 	runner.run(suite)
 
 def main():
-	import pygtk, gtk
+	import gtk
 	global ps
 	ps = PresenceService.get_instance()
 	ps.start()
--
cgit v0.9.1