Clean up all the Gloab log statements

openlp.pyw

@@ -59,13 +59,13 @@ QToolBar
   padding: 0;
 }
 """
+log = logging.getLogger(__name__)
 
 class OpenLP(QtGui.QApplication):
     """
     The core application class. This class inherits from Qt's QApplication
     class in order to provide the core of the application.
     """
-    global log
     log.info(u'OpenLP Application Loaded')
 
     def notify(self, obj, evt):

openlp/core/lib/eventreceiver.py

@@ -27,6 +27,8 @@ import logging
 
 from PyQt4 import QtCore
 
+log = logging.getLogger(__name__)
+
 class EventReceiver(QtCore.QObject):
     """
     Class to allow events to be passed from different parts of the
@@ -108,9 +110,6 @@ class EventReceiver(QtCore.QObject):
         Informs all components of the presentation types supported.
 
     """
-    global log
-    log = logging.getLogger(u'EventReceiver')
-
     def __init__(self):
         """
         Initialise the event receiver, calling the parent constructor.

openlp/core/lib/mediamanageritem.py

@@ -32,6 +32,8 @@ from openlp.core.lib.toolbar import *
 from openlp.core.lib import contextMenuAction, contextMenuSeparator
 from serviceitem import ServiceItem
 
+log = logging.getLogger(__name__)
+
 class MediaManagerItem(QtGui.QWidget):
     """
     MediaManagerItem is a helper widget for plugins.
@@ -92,9 +94,6 @@ class MediaManagerItem(QtGui.QWidget):
         method is not defined, a default will be used (treat the
         filename as an image).
     """
-
-    global log
-    log = logging.getLogger(u'MediaManagerItem')
     log.info(u'Media Item loaded')
 
     def __init__(self, parent=None, icon=None, title=None):

openlp/core/lib/plugin.py

@@ -28,6 +28,8 @@ from PyQt4 import QtCore
 
 from openlp.core.lib import PluginConfig, Receiver
 
+log = logging.getLogger(__name__)
+
 class PluginStatus(object):
     """
     Defines the status of the plugin
@@ -88,8 +90,6 @@ class Plugin(QtCore.QObject):
         Used in the plugin manager, when a person clicks on the 'About' button.
 
     """
-    global log
-    log = logging.getLogger(u'Plugin')
     log.info(u'loaded')
 
     def __init__(self, name, version=None, plugin_helpers=None):

openlp/core/lib/pluginmanager.py

@@ -29,13 +29,13 @@ import logging
 
 from openlp.core.lib import Plugin, PluginStatus
 
+log = logging.getLogger(__name__)
+
 class PluginManager(object):
     """
     This is the Plugin manager, which loads all the plugins,
     and executes all the hooks, as and when necessary.
     """
-    global log
-    log = logging.getLogger(u'PluginMgr')
     log.info(u'Plugin manager loaded')
 
     def __init__(self, dir):

openlp/core/lib/renderer.py

@@ -28,13 +28,13 @@ import logging
 from PyQt4 import QtGui, QtCore
 from openlp.core.lib import resize_image
 
+log = logging.getLogger(__name__)
+
 class Renderer(object):
     """
     Genarates a pixmap image of a array of text. The Text is formatted to
     make sure it fits on the screen and if not extra frames are generated.
     """
-    global log
-    log = logging.getLogger(u'Renderer')
     log.info(u'Renderer Loaded')
 
     def __init__(self):

openlp/core/lib/rendermanager.py

@@ -30,6 +30,8 @@ from PyQt4 import QtCore
 from renderer import Renderer
 from openlp.core.lib import ThemeLevel
 
+log = logging.getLogger(__name__)
+
 class RenderManager(object):
     """
     Class to pull all Renderer interactions into one place. The plugins will
@@ -45,8 +47,6 @@ class RenderManager(object):
     ``screen_number``
         Defaults to *0*. The index of the output/display screen.
     """
-    global log
-    log = logging.getLogger(u'RenderManager')
     log.info(u'RenderManager Loaded')
 
     def __init__(self, theme_manager, screens, screen_number=0):

openlp/core/lib/serviceitem.py

@@ -32,6 +32,8 @@ from PyQt4 import QtGui
 
 from openlp.core.lib import build_icon, Receiver, resize_image
 
+log = logging.getLogger(__name__)
+
 class ServiceItemType(object):
     """
     Defines the type of service item
@@ -46,8 +48,6 @@ class ServiceItem(object):
     the service manager, the slide controller, and the projection screen
     compositor.
     """
-    global log
-    log = logging.getLogger(u'ServiceItem')
     log.info(u'Service Item created')
 
     def __init__(self, plugin=None):

openlp/core/lib/songxmlhandler.py

@@ -27,6 +27,8 @@ import logging
 from xml.dom.minidom import Document
 from xml.etree.ElementTree import ElementTree, XML, dump
 
+log = logging.getLogger(__name__)
+
 class SongXMLBuilder(object):
     """
     This class builds the XML used to describe songs.
@@ -42,8 +44,6 @@ class SongXMLBuilder(object):
           </lyrics>
         </song>
     """
-    global log
-    log = logging.getLogger(u'SongXMLBuilder')
     log.info(u'SongXMLBuilder Loaded')
 
     def __init__(self):
@@ -123,8 +123,6 @@ class SongXMLParser(object):
           </lyrics>
         </song>
     """
-    global log
-    log = logging.getLogger(u'SongXMLParser')
     log.info(u'SongXMLParser Loaded')
 
     def __init__(self, xml):
@@ -158,4 +156,4 @@ class SongXMLParser(object):
         """
         Debugging aid to dump XML so that we can see what we have.
         """
-        return dump(self.song_xml)
+        return dump(self.song_xml)

openlp/core/ui/maindisplay.py

@@ -31,13 +31,13 @@ from PyQt4.phonon import Phonon
 
 from openlp.core.lib import Receiver, resize_image
 
+log = logging.getLogger(__name__)
+
 class DisplayWidget(QtGui.QWidget):
     """
     Customised version of QTableWidget which can respond to keyboard
     events.
     """
-    global log
-    log = logging.getLogger(u'MainDisplay')
     log.info(u'MainDisplay loaded')
 
     def __init__(self, parent=None, name=None):
@@ -78,8 +78,6 @@ class MainDisplay(DisplayWidget):
     """
     This is the form that is used to display things on the projector.
     """
-    global log
-    log = logging.getLogger(u'MainDisplay')
     log.info(u'MainDisplay Loaded')
 
     def __init__(self, parent, screens):

openlp/core/ui/mainwindow.py

@@ -36,6 +36,8 @@ from openlp.core.lib import RenderManager, PluginConfig, build_icon, \
     OpenLPDockWidget, SettingsManager, PluginManager, Receiver, str_to_bool
 from openlp.core.utils import check_latest_version
 
+log = logging.getLogger(__name__)
+
 media_manager_style = """
   QToolBox::tab {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
@@ -420,8 +422,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
     """
     The main window.
     """
-    global log
-    log = logging.getLogger(u'MainWindow')
     log.info(u'MainWindow loaded')
 
     def __init__(self, screens, applicationVersion):

openlp/core/ui/pluginform.py

@@ -30,9 +30,9 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib.plugin import PluginStatus
 from plugindialog import Ui_PluginViewDialog
 
+log = logging.getLogger(__name__)
+
 class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
-    global log
-    log = logging.getLogger(u'PluginForm')
 
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
@@ -126,4 +126,4 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         elif self.activePlugin.status == PluginStatus.Disabled:
             status_text = 'Disabled'
         self.PluginListWidget.currentItem().setText(
-            u'%s (%s)' % (self.activePlugin.name, status_text))
+            u'%s (%s)' % (self.activePlugin.name, status_text))

openlp/core/ui/screen.py

@@ -24,12 +24,12 @@
 ###############################################################################
 import logging
 
+log = logging.getLogger(__name__)
+
 class ScreenList(object):
     """
     Wrapper to handle the parameters of the display screen
     """
-    global log
-    log = logging.getLogger(u'Screen')
     log.info(u'Screen loaded')
 
     def __init__(self):

openlp/core/ui/servicemanager.py

@@ -28,6 +28,8 @@ import logging
 import cPickle
 import zipfile
 
+log = logging.getLogger(__name__)
+
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
     contextMenuAction, contextMenuSeparator, contextMenu, Receiver, \
@@ -105,9 +107,6 @@ class ServiceManager(QtGui.QWidget):
     the resources used into one OSZ file for use on any OpenLP v2 installation.
     Also handles the UI tasks of moving things up and down etc.
     """
-    global log
-    log = logging.getLogger(u'ServiceManager')
-
     def __init__(self, parent):
         """
         Sets up the service manager, toolbars, list view, et al.

openlp/core/ui/slidecontroller.py

@@ -33,6 +33,8 @@ from PyQt4.phonon import Phonon
 from openlp.core.lib import OpenLPToolbar, Receiver, str_to_bool, \
 PluginConfig, resize_image
 
+log = logging.getLogger(__name__)
+
 class SlideList(QtGui.QTableWidget):
     """
     Customised version of QTableWidget which can respond to keyboard
@@ -74,9 +76,6 @@ class SlideController(QtGui.QWidget):
     SlideController is the slide controller widget. This widget is what the
     user uses to control the displaying of verses/slides/etc on the screen.
     """
-    global log
-    log = logging.getLogger(u'SlideController')
-
     def __init__(self, parent, settingsmanager, isLive=False):
         """
         Set up the Slide Controller.

openlp/core/ui/thememanager.py

@@ -38,13 +38,12 @@ from openlp.core.lib import PluginConfig, OpenLPToolbar, contextMenuAction, \
     contextMenuSeparator
 from openlp.core.utils import ConfigHelper
 
+log = logging.getLogger(__name__)
+
 class ThemeManager(QtGui.QWidget):
     """
     Manages the orders of Theme.
     """
-    global log
-    log = logging.getLogger(u'ThemeManager')
-
     def __init__(self, parent):
         QtGui.QWidget.__init__(self, parent)
         self.parent = parent

openlp/migration/display.py

@@ -25,9 +25,9 @@
 
 import logging
 
+log = logging.getLogger(__name__)
+
 class Display():
-    global log
-    log = logging.getLogger(u'Display Logger')
     log.info(u'Display Class loaded')
 
     @staticmethod
@@ -39,4 +39,4 @@ class Display():
     def sub_output(string):
         if not string is None:
             log.debug(u'   '+string);
-            print (u'   '+string)
+            print (u'   '+string)

openlp/plugins/alerts/alertsplugin.py

@@ -31,9 +31,9 @@ from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.alerts.lib import AlertsManager, DBManager
 from openlp.plugins.alerts.forms import AlertsTab, AlertForm, AlertEditForm
 
+log = logging.getLogger(__name__)
+
 class alertsPlugin(Plugin):
-    global log
-    log = logging.getLogger(u'AlertsPlugin')
     log.info(u'Alerts Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/alerts/lib/alertsmanager.py

@@ -29,12 +29,12 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver
 
+log = logging.getLogger(__name__)
+
 class AlertsManager(QtCore.QObject):
     """
-    BiblesTab is the Bibles settings tab in the settings dialog.
+    AlertsTab is the Alerts settings tab in the settings dialog.
     """
-    global log
-    log = logging.getLogger(u'AlertManager')
     log.info(u'Alert Manager loaded')
 
     def __init__(self, parent):

openlp/plugins/alerts/lib/manager.py

@@ -27,14 +27,13 @@ import logging
 
 from openlp.plugins.alerts.lib.models import init_models, metadata, AlertItem
 
+log = logging.getLogger(__name__)
+
 class DBManager():
     """
     The Song Manager provides a central location for all database code. This
     class takes care of connecting to the database and running all the queries.
     """
-
-    global log
-    log = logging.getLogger(u'AlertsDBManager')
     log.info(u'Alerts DB loaded')
 
     def __init__(self, config):

openlp/plugins/bibles/bibleplugin.py

@@ -30,9 +30,9 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
+log = logging.getLogger(__name__)
+
 class BiblePlugin(Plugin):
-    global log
-    log = logging.getLogger(u'BiblePlugin')
     log.info(u'Bible Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/bibles/forms/importwizardform.py

@@ -34,6 +34,8 @@ from bibleimportwizard import Ui_BibleImportWizard
 from openlp.core.lib import Receiver
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
+log = logging.getLogger(__name__)
+
 class DownloadLocation(object):
     Unknown = -1
     Crosswalk = 0
@@ -54,9 +56,6 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
     This is the Bible Import Wizard, which allows easy importing of Bibles
     into OpenLP from other formats like OSIS, CSV and OpenSong.
     """
-
-    global log
-    log = logging.getLogger(u'BibleImportForm')
     log.info(u'BibleImportForm loaded')
 
     def __init__(self, parent, config, manager, bibleplugin):
@@ -371,4 +370,4 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.ImportProgressBar.setValue(self.ImportProgressBar.maximum())
         self.finishButton.setVisible(True)
         self.cancelButton.setVisible(False)
-        Receiver.send_message(u'process_events')
+        Receiver.send_message(u'process_events')

openlp/plugins/bibles/lib/biblestab.py

@@ -29,12 +29,12 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import str_to_bool, Receiver, SettingsTab
 
+log = logging.getLogger(__name__)
+
 class BiblesTab(SettingsTab):
     """
     BiblesTab is the Bibles settings tab in the settings dialog.
     """
-    global log
-    log = logging.getLogger(u'BibleTab')
     log.info(u'Bible Tab loaded')
 
     def __init__(self, title, section=None):

openlp/plugins/bibles/lib/manager.py

@@ -33,6 +33,8 @@ from csvbible import CSVBible
 from db import BibleDB
 from http import HTTPBible
 
+log = logging.getLogger(__name__)
+
 class BibleMode(object):
     """
     This is basically an enumeration class which specifies the mode of a Bible.
@@ -85,8 +87,6 @@ class BibleManager(object):
     """
     The Bible manager which holds and manages all the Bibles.
     """
-    global log
-    log = logging.getLogger(u'BibleManager')
     log.info(u'Bible manager loaded')
 
     def __init__(self, parent, config):

openlp/plugins/bibles/lib/mediaitem.py

@@ -32,6 +32,8 @@ from openlp.core.lib import MediaManagerItem, Receiver, str_to_bool, \
     BaseListWithDnD
 from openlp.plugins.bibles.forms import ImportWizardForm
 
+log = logging.getLogger(__name__)
+
 class BibleListView(BaseListWithDnD):
     """
     Drag and drop capable list for Bibles.
@@ -47,8 +49,6 @@ class BibleMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Bibles.
     """
-    global log
-    log = logging.getLogger(u'BibleMediaItem')
     log.info(u'Bible Media Item loaded')
 
     def __init__(self, parent, icon, title):

openlp/plugins/bibles/lib/osis.py

@@ -33,12 +33,12 @@ import re
 from openlp.core.lib import Receiver
 from db import BibleDB
 
+log = logging.getLogger(__name__)
+
 class OSISBible(BibleDB):
     """
     OSIS Bible format importer class.
     """
-    global log
-    log = logging.getLogger(u'BibleOSISImpl')
     log.info(u'BibleOSISImpl loaded')
 
     def __init__(self, parent, **kwargs):

openlp/plugins/custom/customplugin.py

@@ -29,6 +29,7 @@ from forms import EditCustomForm
 from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.custom.lib import CustomManager, CustomMediaItem, CustomTab
 
+log = logging.getLogger(__name__)
 
 class CustomPlugin(Plugin):
     """
@@ -39,9 +40,6 @@ class CustomPlugin(Plugin):
     the songs plugin has become restrictive. Examples could be
     Welcome slides, Bible Reading information, Orders of service.
     """
-
-    global log
-    log = logging.getLogger(u'CustomPlugin')
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/custom/forms/editcustomform.py

@@ -30,12 +30,12 @@ from editcustomdialog import Ui_customEditDialog
 from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
 from openlp.plugins.custom.lib.models import CustomSlide
 
+log = logging.getLogger(__name__)
+
 class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
     """
     Class documentation goes here.
     """
-    global log
-    log = logging.getLogger(u'EditCustomForm')
     log.info(u'Custom Editor loaded')
     def __init__(self, custommanager, parent = None):
         """

openlp/plugins/custom/lib/manager.py

@@ -27,14 +27,13 @@ import logging
 
 from openlp.plugins.custom.lib.models import init_models, metadata, CustomSlide
 
+log = logging.getLogger(__name__)
+
 class CustomManager():
     """
     The Song Manager provides a central location for all database code. This
     class takes care of connecting to the database and running all the queries.
     """
-
-    global log
-    log = logging.getLogger(u'CustomManager')
     log.info(u'Custom manager loaded')
 
     def __init__(self, config):

openlp/plugins/custom/lib/mediaitem.py

@@ -30,6 +30,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, SongXMLParser, BaseListWithDnD,\
 Receiver, str_to_bool
 
+log = logging.getLogger(__name__)
+
 class CustomListView(BaseListWithDnD):
     def __init__(self, parent=None):
         self.PluginName = u'Custom'
@@ -39,8 +41,6 @@ class CustomMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Custom Slides.
     """
-    global log
-    log = logging.getLogger(u'CustomMediaItem')
     log.info(u'Custom Media Item loaded')
 
     def __init__(self, parent, icon, title):

openlp/plugins/images/imageplugin.py

@@ -28,9 +28,9 @@ import logging
 from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
 
+log = logging.getLogger(__name__)
+
 class ImagePlugin(Plugin):
-    global log
-    log = logging.getLogger(u'ImagePlugin')
     log.info(u'Image Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/images/lib/mediaitem.py

@@ -29,6 +29,8 @@ import os
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon
 
+log = logging.getLogger(__name__)
+
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.
 class ImageListView(BaseListWithDnD):
@@ -40,8 +42,6 @@ class ImageMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for images.
     """
-    global log
-    log = logging.getLogger(u'ImageMediaItem')
     log.info(u'Image Media Item loaded')
 
     def __init__(self, parent, icon, title):

openlp/plugins/presentations/lib/impresscontroller.py

@@ -46,15 +46,15 @@ from PyQt4 import QtCore
 
 from presentationcontroller import PresentationController
 
+log = logging.getLogger(__name__)
+
 class ImpressController(PresentationController):
     """
     Class to control interactions with Impress presentations.
     It creates the runtime environment, loads and closes the presentation as
     well as triggering the correct activities based on the users input
     """
-    global log
+    log.info(u'ImpressController loaded')
-    log = logging.getLogger(u'ImpressController')
-    log.info(u'loaded')
 
     def __init__(self, plugin):
         """

openlp/plugins/presentations/lib/mediaitem.py

@@ -31,6 +31,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD
 from openlp.plugins.presentations.lib import MessageListener
 
+log = logging.getLogger(__name__)
+
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.
 class PresentationListView(BaseListWithDnD):
@@ -43,8 +45,6 @@ class PresentationMediaItem(MediaManagerItem):
     This is the Presentation media manager item for Presentation Items.
     It can present files using Openoffice
     """
-    global log
-    log = logging.getLogger(u'PresentationsMediaItem')
     log.info(u'Presentations Media Item loaded')
 
     def __init__(self, parent, icon, title, controllers):

openlp/plugins/presentations/lib/messagelistener.py

@@ -30,13 +30,13 @@ from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
 
+log = logging.getLogger(__name__)
+
 class Controller(object):
     """
     This is the Presentation listener who acts on events from the slide
     controller and passes the messages on the the correct presentation handlers
     """
-    global log
-    log = logging.getLogger(u'Controller')
     log.info(u'Controller loaded')
 
     def __init__(self, live):
@@ -149,8 +149,6 @@ class MessageListener(object):
     This is the Presentation listener who acts on events from the slide
     controller and passes the messages on the the correct presentation handlers
     """
-    global log
-    log = logging.getLogger(u'MessageListener')
     log.info(u'Message Listener loaded')
 
     def __init__(self, controllers):

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -33,6 +33,8 @@ if os.name == u'nt':
 
 from presentationcontroller import PresentationController
 
+log = logging.getLogger(__name__)
+
 # PPT API documentation:
 # http://msdn.microsoft.com/en-us/library/aa269321(office.10).aspx
 
@@ -42,9 +44,7 @@ class PowerpointController(PresentationController):
     It creates the runtime Environment , Loads the and Closes the Presentation
     As well as triggering the correct activities based on the users input
     """
-    global log
+    log.info(u'PowerpointController loaded')
-    log = logging.getLogger(u'PowerpointController')
-    log.info(u'loaded')
 
     def __init__(self, plugin):
         """

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -32,15 +32,15 @@ if os.name == u'nt':
 
 from presentationcontroller import PresentationController
 
+log = logging.getLogger(__name__)
+
 class PptviewController(PresentationController):
     """
     Class to control interactions with PowerPOint Viewer Presentations
     It creates the runtime Environment , Loads the and Closes the Presentation
     As well as triggering the correct activities based on the users input
     """
-    global log
+    log.info(u'PPTViewController loaded')
-    log = logging.getLogger(u'PptviewController')
-    log.info(u'loaded')
 
     def __init__(self, plugin):
         """

openlp/plugins/presentations/lib/presentationcontroller.py

@@ -31,6 +31,8 @@ from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
 
+log = logging.getLogger(__name__)
+
 class PresentationController(object):
     """
     Base class for presentation controllers to inherit from
@@ -116,8 +118,6 @@ class PresentationController(object):
         Returns a path to an image containing a preview for the requested slide
 
     """
-    global log
-    log = logging.getLogger(u'PresentationController')
     log.info(u'PresentationController loaded')
 
     def __init__(self, plugin=None, name=u'PresentationController'):

openlp/plugins/presentations/presentationplugin.py

@@ -29,9 +29,9 @@ import logging
 from openlp.core.lib import Plugin, build_icon, Receiver, PluginStatus
 from openlp.plugins.presentations.lib import *
 
-class PresentationPlugin(Plugin):
+log = logging.getLogger(__name__)
 
-    global log
+class PresentationPlugin(Plugin):
     log = logging.getLogger(u'PresentationPlugin')
 
     def __init__(self, plugin_helpers):

openlp/plugins/remotes/remoteplugin.py

@@ -30,10 +30,9 @@ from PyQt4 import QtNetwork, QtCore
 from openlp.core.lib import Plugin, Receiver
 from openlp.plugins.remotes.lib import RemoteTab
 
-class RemotesPlugin(Plugin):
+log = logging.getLogger(__name__)
 
-    global log
+class RemotesPlugin(Plugin):
-    log = logging.getLogger(u'RemotesPlugin')
     log.info(u'Remote Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/songs/lib/manager.py

@@ -28,14 +28,13 @@ import logging
 from openlp.plugins.songs.lib.models import init_models, metadata, Song, \
     Author, Topic, Book
 
+log = logging.getLogger(__name__)
+
 class SongManager():
     """
     The Song Manager provides a central location for all database code. This
     class takes care of connecting to the database and running all the queries.
     """
-
-    global log
-    log = logging.getLogger(u'SongManager')
     log.info(u'Song manager loaded')
 
     def __init__(self, config):

openlp/plugins/songs/lib/mediaitem.py

@@ -31,6 +31,8 @@ from openlp.core.lib import MediaManagerItem, SongXMLParser, \
     BaseListWithDnD, Receiver,  str_to_bool
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
 
+log = logging.getLogger(__name__)
+
 class SongListView(BaseListWithDnD):
     def __init__(self, parent=None):
         self.PluginName = u'Songs'
@@ -40,8 +42,6 @@ class SongMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Songs.
     """
-    global log
-    log = logging.getLogger(u'SongMediaItem')
     log.info(u'Song Media Item loaded')
 
     def __init__(self, parent, icon, title):

openlp/plugins/songs/songsplugin.py

@@ -32,6 +32,8 @@ from openlp.plugins.songs.lib import SongManager, SongMediaItem, SongsTab
 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
     OpenSongImportForm, OpenLPExportForm
 
+log = logging.getLogger(__name__)
+
 class SongsPlugin(Plugin):
     """
     This is the number 1 plugin, if importance were placed on any
@@ -40,9 +42,6 @@ class SongsPlugin(Plugin):
     specified. Authors, topics and song books can be assigned to songs
     as well.
     """
-
-    global log
-    log = logging.getLogger(u'SongsPlugin')
     log.info(u'Song Plugin loaded')
 
     def __init__(self, plugin_helpers):

openlp/plugins/songusage/forms/songusagedetailform.py

@@ -29,9 +29,9 @@ import logging
 
 from songusagedetaildialog import Ui_SongUsageDetailDialog
 
+log = logging.getLogger(__name__)
+
 class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
-    global log
-    log = logging.getLogger(u'SongUsageDetailForm')
     log.info(u'SongUsage Detail Form loaded')
     """
     Class documentation goes here.

openlp/plugins/songusage/lib/manager.py

@@ -27,14 +27,13 @@ import logging
 
 from openlp.plugins.songusage.lib.models import init_models, metadata, SongUsageItem
 
+log = logging.getLogger(__name__)
+
 class SongUsageManager():
     """
     The Song Manager provides a central location for all database code. This
     class takes care of connecting to the database and running all the queries.
     """
-
-    global log
-    log = logging.getLogger(u'SongUsageManager')
     log.info(u'SongUsage manager loaded')
 
     def __init__(self, config):

openlp/plugins/songusage/songusageplugin.py

@@ -33,9 +33,9 @@ from openlp.plugins.songusage.lib import SongUsageManager
 from openlp.plugins.songusage.forms import SongUsageDetailForm, SongUsageDeleteForm
 from openlp.plugins.songusage.lib.models import SongUsageItem
 
+log = logging.getLogger(__name__)
+
 class SongUsagePlugin(Plugin):
-    global log
-    log = logging.getLogger(u'SongUsagePlugin')
     log.info(u'SongUsage Plugin loaded')
 
     def __init__(self, plugin_helpers):