From 842898aaf9c96306f22da61a788c47da423bdae6 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Thu, 9 Oct 2014 07:41:32 -0700 Subject: [PATCH] Remove extraneous imports --- openlp/core/lib/projector/db.py | 7 +++---- openlp/core/ui/projector/manager.py | 11 ++++------- openlp/core/ui/projector/tab.py | 3 +-- openlp/core/ui/projector/wizard.py | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/openlp/core/lib/projector/db.py b/openlp/core/lib/projector/db.py index d7abf6fe0..07881a1df 100644 --- a/openlp/core/lib/projector/db.py +++ b/openlp/core/lib/projector/db.py @@ -37,14 +37,13 @@ log.debug('projector.lib.db module loaded') from os import path -from sqlalchemy import Column, ForeignKey, Integer, MetaData, Sequence, String, and_ +from sqlalchemy import Column, ForeignKey, Integer, MetaData, String, and_ from sqlalchemy.ext.declarative import declarative_base, declared_attr -from sqlalchemy.orm import backref, joinedload, relationship +from sqlalchemy.orm import backref, relationship from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound -from sqlalchemy.sql import select from openlp.core.common import translate -from openlp.core.lib.db import BaseModel, Manager, init_db, init_url +from openlp.core.lib.db import Manager, init_db, init_url from openlp.core.lib.projector.constants import PJLINK_DEFAULT_SOURCES metadata = MetaData() diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py index b082840ae..ec9207a2b 100644 --- a/openlp/core/ui/projector/manager.py +++ b/openlp/core/ui/projector/manager.py @@ -38,17 +38,14 @@ log.debug('projectormanager loaded') from PyQt4 import QtCore, QtGui from PyQt4.QtCore import QObject, QThread, pyqtSlot -from openlp.core.common import Registry, RegistryProperties, Settings, OpenLPMixin, \ +from openlp.core.common import RegistryProperties, Settings, OpenLPMixin, \ RegistryMixin, translate -from openlp.core.lib import OpenLPToolbar, ImageSource, get_text_file_string, build_icon,\ - check_item_selected, create_thumb -from openlp.core.lib.ui import critical_error_message_box, create_widget_action -from openlp.core.utils import get_locale_key, get_filesystem_encoding - +from openlp.core.lib import OpenLPToolbar +from openlp.core.lib.ui import create_widget_action +from openlp.core.lib.projector.constants import * from openlp.core.lib.projector.db import ProjectorDB from openlp.core.lib.projector.pjlink1 import PJLink1 from openlp.core.ui.projector.wizard import ProjectorWizard -from openlp.core.lib.projector.constants import * # Dict for matching projector status to display icon STATUS_ICONS = {S_NOT_CONNECTED: ':/projector/projector_item_disconnect.png', diff --git a/openlp/core/ui/projector/tab.py b/openlp/core/ui/projector/tab.py index 1d0ed90f2..0a79595c9 100644 --- a/openlp/core/ui/projector/tab.py +++ b/openlp/core/ui/projector/tab.py @@ -37,9 +37,8 @@ log.debug('projectortab module loaded') from PyQt4 import QtCore, QtGui -from openlp.core.common import Registry, Settings, UiStrings, translate +from openlp.core.common import Settings, UiStrings, translate from openlp.core.lib import SettingsTab -from openlp.core.lib.ui import find_and_set_in_combo_box class ProjectorTab(SettingsTab): diff --git a/openlp/core/ui/projector/wizard.py b/openlp/core/ui/projector/wizard.py index 73dadd109..e95c68e30 100644 --- a/openlp/core/ui/projector/wizard.py +++ b/openlp/core/ui/projector/wizard.py @@ -40,7 +40,7 @@ from ipaddress import IPv4Address, IPv6Address, AddressValueError from PyQt4 import QtCore, QtGui from PyQt4.QtCore import pyqtSlot, pyqtSignal -from openlp.core.common import Registry, RegistryProperties, translate, is_macosx +from openlp.core.common import RegistryProperties, translate, is_macosx from openlp.core.lib import build_icon from openlp.core.common import verify_ip_address