Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2013-12-24 16:32:52 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2013-12-24 16:32:52 (GMT)
commitcc1e556471b4ad102f5c446868c687241859bfb1 (patch)
treea5f82a807b8f86af43d823e41ad722b5fff1f952
parent1f555411d785e96da9d792a3ea5efbe88eaf6595 (diff)
Reorder imports
-rw-r--r--globos.py5
-rw-r--r--historietaactivity.py30
-rw-r--r--persistencia.py5
-rw-r--r--toolbar.py11
4 files changed, 25 insertions, 26 deletions
diff --git a/globos.py b/globos.py
index f4c870f..54fd129 100644
--- a/globos.py
+++ b/globos.py
@@ -2,11 +2,12 @@
import os
import math
+import cairo
+import logging
+
from gi.repository import Gtk, Gdk, GObject
from gi.repository import Pango
from gi.repository import PangoCairo
-import cairo
-import logging
from sugar3.activity import activity
from sugar3.graphics.icon import _IconBuffer
diff --git a/historietaactivity.py b/historietaactivity.py
index 0d77573..8252e30 100644
--- a/historietaactivity.py
+++ b/historietaactivity.py
@@ -1,37 +1,35 @@
# -*- coding: UTF-8 -*-
import os
+import cairo
+import dbus
+import logging
+from gettext import gettext as _
+import time
+
from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GdkPixbuf
-import cairo
-
-import globos
-import persistencia
from sugar3.activity import activity
-from gettext import gettext as _
-
from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
from sugar3.activity.widgets import StopButton
from sugar3.activity.widgets import ActivityToolbarButton
from sugar3.graphics.toggletoolbutton import ToggleToolButton
from sugar3.graphics.toolbutton import ToolButton
-from toolbar import TextToolbar
-from toolbar import GlobesManager
-
-from slideview import SlideView
-from reorderwindow import ReorderView
-from reorderwindow import ImageEditorView
-
-import time
from sugar3.datastore import datastore
from sugar3 import profile
from sugar3.graphics import style
from sugar3.graphics.alert import Alert
from sugar3.graphics.icon import Icon
-import dbus
-import logging
+
+import globos
+import persistencia
+from toolbar import TextToolbar
+from toolbar import GlobesManager
+from slideview import SlideView
+from reorderwindow import ReorderView
+from reorderwindow import ImageEditorView
class HistorietaActivity(activity.Activity):
diff --git a/persistencia.py b/persistencia.py
index dfc269e..a091c66 100644
--- a/persistencia.py
+++ b/persistencia.py
@@ -1,10 +1,11 @@
import os
import json
import logging
+import zipfile
-import globos
from sugar3.activity import activity
-import zipfile
+
+import globos
class PageData:
diff --git a/toolbar.py b/toolbar.py
index 98ea0e9..06c6291 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -21,26 +21,25 @@ from gettext import gettext as _
import logging
import os
import time
-# Gtk3
+
from gi.repository import Gtk, Gdk
+
from sugar3.graphics.toolbutton import ToolButton
from sugar3.graphics.toggletoolbutton import ToggleToolButton
from sugar3.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.palettemenu import PaletteMenuItem
+from sugar3.graphics.palettemenu import PaletteMenuBox
+from sugar3.graphics.colorbutton import ColorToolButton
from sugar3.graphics.objectchooser import ObjectChooser
try:
from sugar3.graphics.objectchooser import FILTER_TYPE_GENERIC_MIME
except:
FILTER_TYPE_GENERIC_MIME = 'generic_mime'
-from sugar3.graphics.palettemenu import PaletteMenuItem
-from sugar3.graphics.palettemenu import PaletteMenuBox
-
from fontcombobox import FontComboBox
from fontcombobox import FontSize
import globos
-from sugar3.graphics.colorbutton import ColorToolButton
-
##Class to manage the Text Color
class TextButtonColor(ColorToolButton):