[Console] Fix import typos

This commit is contained in:
Calum Lind 2014-09-20 20:43:16 +01:00
commit ebcf14df06
11 changed files with 40 additions and 39 deletions

View file

@ -14,10 +14,10 @@ import os
import deluge.common as common import deluge.common as common
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console import format_utils from deluge.ui.console.modes import format_utils
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes.basemode import BaseMode
from deluge.ui.console.input_popup import InputPopup from deluge.ui.console.modes.input_popup import InputPopup
from deluge.ui.console.popup import MessagePopup from deluge.ui.console.modes.popup import MessagePopup
try: try:
import curses import curses

View file

@ -12,19 +12,19 @@ from collections import deque
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
import deluge.ui.console.column import deluge.ui.console.modes.column
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console import format_utils from deluge.ui.console.modes import format_utils
from deluge.ui.console.addtorrents import AddTorrents from deluge.ui.console.modes.addtorrents import AddTorrents
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes.basemode import BaseMode
from deluge.ui.console.eventview import EventView from deluge.ui.console.modes.eventview import EventView
from deluge.ui.console.input_popup import InputPopup from deluge.ui.console.modes.input_popup import InputPopup
from deluge.ui.console.legacy import Legacy from deluge.ui.console.modes.legacy import Legacy
from deluge.ui.console.popup import MessagePopup, Popup, SelectablePopup from deluge.ui.console.modes.popup import MessagePopup, Popup, SelectablePopup
from deluge.ui.console.preferences import Preferences from deluge.ui.console.modes.preferences import Preferences
from deluge.ui.console.torrent_actions import ACTION, torrent_actions_popup from deluge.ui.console.modes.torrent_actions import ACTION, torrent_actions_popup
from deluge.ui.console.torrentdetail import TorrentDetail from deluge.ui.console.modes.torrentdetail import TorrentDetail
try: try:
import curses import curses
@ -365,7 +365,7 @@ class AllTorrents(BaseMode, component.Component):
if ("show_%s" % pref) not in self.config or self.config["show_%s" % pref]] if ("show_%s" % pref) not in self.config or self.config["show_%s" % pref]]
self.__columns = [prefs_to_names[col] for col in self.__cols_to_show] self.__columns = [prefs_to_names[col] for col in self.__cols_to_show]
self.__status_fields = deluge.ui.console.column.get_required_fields(self.__columns) self.__status_fields = deluge.ui.console.modes.column.get_required_fields(self.__columns)
# we always need these, even if we're not displaying them # we always need these, even if we're not displaying them
for rf in ["state", "name", "queue", "progress"]: for rf in ["state", "name", "queue", "progress"]:
@ -870,7 +870,7 @@ class AllTorrents(BaseMode, component.Component):
#Because dots are slow #Because dots are slow
sorted_ids = self._sorted_ids sorted_ids = self._sorted_ids
curstate = self.curstate curstate = self.curstate
gcv = deluge.ui.console.column.get_column_value gcv = deluge.ui.console.modes.column.get_column_value
fr = format_utils.format_row fr = format_utils.format_row
cols = self.__columns cols = self.__columns
colw = self.column_widths colw = self.column_widths

View file

@ -10,7 +10,7 @@
import logging import logging
import deluge.common import deluge.common
from deluge.ui.console import format_utils from deluge.ui.console.modes import format_utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View file

@ -17,10 +17,10 @@ from collections import deque
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
from deluge.ui.client import Client, client from deluge.ui.client import Client, client
from deluge.ui.console.alltorrents import AllTorrents from deluge.ui.console.modes.alltorrents import AllTorrents
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes.basemode import BaseMode
from deluge.ui.console.input_popup import InputPopup from deluge.ui.console.modes.input_popup import InputPopup
from deluge.ui.console.popup import MessagePopup, SelectablePopup from deluge.ui.console.modes.popup import MessagePopup, SelectablePopup
try: try:
import curses import curses

View file

@ -11,8 +11,8 @@ import logging
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console import format_utils from deluge.ui.console.modes import format_utils
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes.basemode import BaseMode
try: try:
import curses import curses

View file

@ -19,7 +19,7 @@ import os
import os.path import os.path
from deluge.ui.console import colors from deluge.ui.console import colors
from deluge.ui.console.popup import ALIGN, Popup from deluge.ui.console.modes.popup import ALIGN, Popup
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View file

@ -24,8 +24,8 @@ import deluge.component as component
import deluge.configmanager import deluge.configmanager
import deluge.ui.console.colors as colors import deluge.ui.console.colors as colors
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console.basemode import BaseMode
from deluge.ui.console.modes import format_utils from deluge.ui.console.modes import format_utils
from deluge.ui.console.modes.basemode import BaseMode
strwidth = format_utils.strwidth strwidth = format_utils.strwidth

View file

@ -14,7 +14,7 @@ except ImportError:
import logging import logging
from deluge.ui.console import format_utils from deluge.ui.console.modes import format_utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View file

@ -12,11 +12,11 @@ from collections import deque
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes.basemode import BaseMode
from deluge.ui.console.input_popup import Popup, SelectInput from deluge.ui.console.modes.input_popup import Popup, SelectInput
from deluge.ui.console.popup import MessagePopup from deluge.ui.console.modes.popup import MessagePopup
from deluge.ui.console.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane, from deluge.ui.console.modes.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane,
InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane) InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane)
try: try:
import curses import curses

View file

@ -14,8 +14,8 @@ from twisted.internet import defer
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console import colors from deluge.ui.console import colors
from deluge.ui.console.input_popup import InputPopup from deluge.ui.console.modes.input_popup import InputPopup
from deluge.ui.console.popup import Popup, SelectablePopup from deluge.ui.console.modes.popup import Popup, SelectablePopup
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View file

@ -14,11 +14,12 @@ from sys import maxint
import deluge.component as component import deluge.component as component
from deluge.common import fdate, FILE_PRIORITY, fsize, ftime from deluge.common import fdate, FILE_PRIORITY, fsize, ftime
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console import colors, format_utils from deluge.ui.console import colors
from deluge.ui.console.basemode import BaseMode from deluge.ui.console.modes import format_utils
from deluge.ui.console.input_popup import InputPopup from deluge.ui.console.modes.basemode import BaseMode
from deluge.ui.console.popup import MessagePopup, SelectablePopup from deluge.ui.console.modes.input_popup import InputPopup
from deluge.ui.console.torrent_actions import ACTION, torrent_actions_popup from deluge.ui.console.modes.popup import MessagePopup, SelectablePopup
from deluge.ui.console.modes.torrent_actions import ACTION, torrent_actions_popup
try: try:
import curses import curses