diff --git a/activities/browser/AddressItem.py b/activities/browser/AddressItem.py index df5e71cd..a6db4e23 100644 --- a/activities/browser/AddressItem.py +++ b/activities/browser/AddressItem.py @@ -1,5 +1,3 @@ -import pygtk -pygtk.require('2.0') import gtk class AddressEntry(gtk.HBox): diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index 45923a92..1d3a4586 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -1,8 +1,6 @@ import logging import xml.sax.saxutils -import pygtk -pygtk.require('2.0') import gtk import geckoembed diff --git a/activities/browser/NavigationToolbar.py b/activities/browser/NavigationToolbar.py index 7c358f63..c8bc2768 100644 --- a/activities/browser/NavigationToolbar.py +++ b/activities/browser/NavigationToolbar.py @@ -1,5 +1,3 @@ -import pygtk -pygtk.require('2.0') import gtk from gettext import gettext as _ diff --git a/activities/browser/NotificationBar.py b/activities/browser/NotificationBar.py index c9b3b8af..c9fd5117 100644 --- a/activities/browser/NotificationBar.py +++ b/activities/browser/NotificationBar.py @@ -1,5 +1,3 @@ -import pygtk -pygtk.require('2.0') import gtk import gobject diff --git a/activities/chat/ChatActivity.py b/activities/chat/ChatActivity.py index 8de01bb3..5a8f383a 100644 --- a/activities/chat/ChatActivity.py +++ b/activities/chat/ChatActivity.py @@ -2,8 +2,6 @@ import dbus import random import logging -import pygtk -pygtk.require('2.0') import gtk import gobject diff --git a/examples/bots/bots.py b/examples/bots/bots.py index 7b7ac664..68bc4e16 100644 --- a/examples/bots/bots.py +++ b/examples/bots/bots.py @@ -1,7 +1,5 @@ import os -import pygtk -pygtk.require('2.0') import gtk from sugar.bots import Bot diff --git a/shell/PresenceView.py b/shell/PresenceView.py index 364ad154..8efc4fd3 100644 --- a/shell/PresenceView.py +++ b/shell/PresenceView.py @@ -1,5 +1,3 @@ -import pygtk -pygtk.require('2.0') import gtk import gobject import dbus diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py index 826c4cfa..f510fde5 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 e7761e21..46f85c9e 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 d69cc55d..b150fa61 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 efd39c00..a60ca123 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 b040644b..23ec5f38 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 0b0605ac..0292e1bf 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 f9df98aa..4c14020b 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 c4dd0a53..b91cb7da 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 bda8fa9f..f38fb085 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()