Commit e1159056 authored by Kai Willadsen's avatar Kai Willadsen

Actually start getting serious about import ordering

parent 8ad71377
......@@ -23,13 +23,12 @@ import distutils.command.build
import distutils.command.build_py
import distutils.command.install
import distutils.command.install_data
import distutils.dist
import distutils.dir_util
import distutils.dist
import glob
import os.path
import platform
import sys
from distutils.log import info
......
......@@ -13,9 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gdk
from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Gdk
class DiffGrid(Gtk.Grid):
......
......@@ -17,7 +17,6 @@
import collections
import cairo
from gi.repository import Gdk
from gi.repository import Gtk
......
......@@ -24,21 +24,20 @@ import os
import shutil
import stat
import sys
from collections import namedtuple
from decimal import Decimal
from gi.repository import GLib
from gi.repository import Gdk
from gi.repository import Gio
from gi.repository import GLib
from gi.repository import GObject
from gi.repository import Gdk
from gi.repository import Gtk
from . import melddoc
from . import tree
from . import misc
from .ui import gnomeglade
from . import tree
from .ui import emblemcellrenderer
from collections import namedtuple
from decimal import Decimal
from .ui import gnomeglade
from meld.conf import _
from meld.misc import all_same
......
......@@ -19,14 +19,13 @@ import functools
import math
import os
from gi.repository import Gdk
from gi.repository import Gio
from gi.repository import GLib
from gi.repository import GObject
from gi.repository import Gio
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import GtkSource
from meld.conf import _
from . import meldbuffer
from . import melddoc
from . import misc
......@@ -34,7 +33,8 @@ from . import undo
from .ui import filechooser
from .ui import gnomeglade
from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT, NEWLINES
from meld.conf import _
from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE, NEWLINES
from meld.matchers.diffutil import Differ, merged_chunk_order
from meld.matchers.helpers import CachedSequenceMatcher
from meld.matchers.merge import Merger
......@@ -42,7 +42,7 @@ from meld.patchdialog import PatchDialog
from meld.recent import RecentType
from meld.settings import bind_settings, meldsettings
from meld.sourceview import (
LanguageManager, TextviewLineAnimationType, get_custom_encoding_candidates)
get_custom_encoding_candidates, LanguageManager, TextviewLineAnimationType)
from meld.ui.findbar import FindBar
......
......@@ -15,13 +15,13 @@
import math
from gi.repository import Pango
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import GtkSource
from gi.repository import Pango
from meld.conf import _
from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT
from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE
from meld.misc import get_common_theme
from meld.settings import meldsettings
from meld.ui.gtkcompat import get_style
......
......@@ -19,15 +19,14 @@ import logging
import optparse
import os
from gi.repository import Gdk
from gi.repository import Gio
from gi.repository import GLib
from gi.repository import Gdk
from gi.repository import Gtk
import meld.conf
import meld.preferences
import meld.ui.util
from meld.conf import _
log = logging.getLogger(__name__)
......
......@@ -22,16 +22,15 @@ import subprocess
import sys
from gi.repository import Gdk
from gi.repository import Gio
from gi.repository import GLib
from gi.repository import GObject
from gi.repository import Gio
from gi.repository import Gtk
from . import task
from meld.conf import _
from meld.settings import settings
from meld.recent import RecentType
from meld.settings import settings
from meld.task import FifoScheduler
log = logging.getLogger(__name__)
......@@ -91,7 +90,7 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject):
def __init__(self):
GObject.GObject.__init__(self)
self.scheduler = task.FifoScheduler()
self.scheduler = FifoScheduler()
self.num_panes = 0
self.main_actiongroup = None
self._state = STATE_NORMAL
......
......@@ -31,7 +31,7 @@ from .ui import gnomeglade
from .ui import notebooklabel
from meld.conf import _
from meld.recent import RecentType, recent_comparisons
from meld.recent import recent_comparisons, RecentType
from meld.settings import interface_settings, settings
from meld.windowstate import SavedWindowState
......
......@@ -19,10 +19,10 @@
"""
import collections
import os
import errno
import shutil
import os
import re
import shutil
import subprocess
from gi.repository import Gdk
......
......@@ -20,10 +20,10 @@ from gi.repository import GLib
from gi.repository import GObject
from gi.repository import Gtk
from .ui import gnomeglade
from meld.conf import _
from meld.melddoc import LabeledObjectMixin
from meld.recent import recent_comparisons
from meld.ui import gnomeglade
class NewDiffTab(LabeledObjectMixin, GObject.GObject, gnomeglade.Component):
......
......@@ -35,7 +35,6 @@ from gi.repository import GLib
from gi.repository import Gtk
import meld.misc
from meld.conf import _
......
......@@ -15,8 +15,8 @@
from gi.repository import Gio
from gi.repository import GObject
from gi.repository import Pango
from gi.repository import GtkSource
from gi.repository import Pango
import meld.conf
import meld.filters
......
......@@ -15,20 +15,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
from gi.repository import GLib
from gi.repository import Gdk
from gi.repository import GLib
from gi.repository import Gtk
from gi.repository import Pango
from meld.misc import colour_lookup_with_fallback
from meld.treehelpers import SearchableTreeStore
from meld.vc._vc import (
STATE_IGNORED, STATE_NONE, STATE_NORMAL, STATE_NOCHANGE,
STATE_ERROR, STATE_EMPTY, STATE_NEW,
STATE_MODIFIED, STATE_CONFLICT, STATE_REMOVED,
STATE_MISSING, STATE_NONEXIST, STATE_MAX,
CONFLICT_BASE, CONFLICT_LOCAL, CONFLICT_REMOTE,
CONFLICT_MERGED, CONFLICT_OTHER, CONFLICT_THIS,
CONFLICT_BASE, CONFLICT_LOCAL, CONFLICT_MERGED, CONFLICT_OTHER,
CONFLICT_REMOTE, CONFLICT_THIS, STATE_CONFLICT, STATE_EMPTY, STATE_ERROR,
STATE_IGNORED, STATE_MAX, STATE_MISSING, STATE_MODIFIED, STATE_NEW,
STATE_NOCHANGE, STATE_NONE, STATE_NONEXIST, STATE_NORMAL, STATE_REMOVED,
)
COL_PATH, COL_STATE, COL_TEXT, COL_ICON, COL_TINT, COL_FG, COL_STYLE, \
......
......@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import cairo
from gi.repository import GObject
from gi.repository import Gdk
from gi.repository import GObject
from gi.repository import Gtk
......
......@@ -16,7 +16,6 @@
from gi.repository import Gtk
import meld.conf
# Import support module to get all builder-constructed widgets in the namespace
from meld.ui import gladesupport
......
......@@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from . import git, mercurial, bzr, svn, darcs, _null
from . import _null, bzr, darcs, git, mercurial, svn
# Tuple of plugins, ordered according to best-guess as to which VC a
# user is likely to want by default in a multiple-VC situation.
......
......@@ -24,11 +24,10 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from collections import defaultdict
import errno
import os
import re
from collections import defaultdict
from . import _vc
......
......@@ -28,6 +28,7 @@ import shutil
import subprocess
import tempfile
from collections import defaultdict
from . import _vc
......
......@@ -36,7 +36,6 @@ import tempfile
from collections import defaultdict
from meld.conf import _, ngettext
from . import _vc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment