Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/datastore/datastore.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-10-15 17:04:05 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-10-15 17:04:05 (GMT)
commit33143f4e0e5c69623d69c8301179e5fed3976cea (patch)
tree1568084c2594439e11a023048483e0d2ac486831 /sugar/datastore/datastore.py
parent1ee7191b5dc40a345742766f0125d33609762ca9 (diff)
parenta9a9b4c73346dcbccd2fb218e1a6c19077672f5c (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/datastore/datastore.py')
-rw-r--r--sugar/datastore/datastore.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 7c57414..a865c30 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -28,7 +28,7 @@ from sugar.activity.activityhandle import ActivityHandle
from sugar.bundle.contentbundle import ContentBundle
from sugar.bundle.activitybundle import ActivityBundle
from sugar.bundle.contentbundle import ContentBundle
-from sugar.objects import mime
+from sugar import mime
class DSMetadata(gobject.GObject):
__gsignals__ = {