sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken imports

Browse Source 
8f1a821d68 only changed imports starting with
"import", but not those using "from ... import ...".

[replaced description]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
This commit is contained in:
Simon Schampijer 2011-10-29 15:55:20 +02:00 committed by Sascha Silbe
parent 8f1a821d68
commit 89ef6304a1
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sugar3/activity/activity.py
View File

@ -70,7 +70,7 @@ from telepathy.interfaces import CHANNEL, \
from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
from sugar import util from sugar3 import util
from sugar3.presence import presenceservice from sugar3.presence import presenceservice
from sugar3.activity.activityservice import ActivityService from sugar3.activity.activityservice import ActivityService
from sugar3.activity.namingalert import NamingAlert from sugar3.activity.namingalert import NamingAlert
@ -80,7 +80,7 @@ from sugar3.graphics.alert import Alert
from sugar3.graphics.icon import Icon from sugar3.graphics.icon import Icon
from sugar3.datastore import datastore from sugar3.datastore import datastore
from sugar3.session import XSMPClient from sugar3.session import XSMPClient
from sugar import wm from sugar3 import wm
# support deprecated imports # support deprecated imports
from sugar3.activity.widgets import ActivityToolbar, EditToolbar from sugar3.activity.widgets import ActivityToolbar, EditToolbar

4
src/sugar3/activity/activityfactory.py
View File

@ -29,8 +29,8 @@ import dbus
import gobject import gobject
from sugar3.activity.activityhandle import ActivityHandle from sugar3.activity.activityhandle import ActivityHandle
from sugar import util from sugar3 import util
from sugar import env from sugar3 import env
from sugar3.datastore import datastore from sugar3.datastore import datastore
from errno import EEXIST, ENOSPC from errno import EEXIST, ENOSPC

2
src/sugar3/activity/bundlebuilder.py
View File

@ -32,7 +32,7 @@ from optparse import OptionParser
import logging import logging
from fnmatch import fnmatch from fnmatch import fnmatch
from sugar import env from sugar3 import env
from sugar3.bundle.activitybundle import ActivityBundle from sugar3.bundle.activitybundle import ActivityBundle

4
src/sugar3/bundle/activitybundle.py
View File

@ -28,8 +28,8 @@ import tempfile
import logging import logging
import warnings import warnings
from sugar import env from sugar3 import env
from sugar import util from sugar3 import util
from sugar3.bundle.bundle import Bundle, \ from sugar3.bundle.bundle import Bundle, \
MalformedBundleException, NotInstalledException MalformedBundleException, NotInstalledException
from sugar3.bundle.bundleversion import NormalizedVersion from sugar3.bundle.bundleversion import NormalizedVersion

2
src/sugar3/bundle/contentbundle.py
View File

@ -25,7 +25,7 @@ from ConfigParser import ConfigParser
import os import os
import urllib import urllib
from sugar import env from sugar3 import env
from sugar3.bundle.bundle import Bundle, NotInstalledException, \ from sugar3.bundle.bundle import Bundle, NotInstalledException, \
MalformedBundleException MalformedBundleException

6
src/sugar3/datastore/datastore.py
View File

@ -31,9 +31,9 @@ import gio
import dbus import dbus
import dbus.glib import dbus.glib
from sugar import env from sugar3 import env
from sugar import mime from sugar3 import mime
from sugar import dispatch from sugar3 import dispatch
DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'

4
src/sugar3/profile.py
View File

@ -25,8 +25,8 @@ import os
import logging import logging
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
from sugar import env from sugar3 import env
from sugar import util from sugar3 import util
from sugar3.graphics.xocolor import XoColor from sugar3.graphics.xocolor import XoColor