Merge pull request #110 from sam-m888/FixImportDuplicates

Fix some duplicate imports etc...

gramps/gui/clipboard.py

@@ -44,7 +44,7 @@ from gi.repository import GdkPixbuf
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gramps.gen.const import IMAGE_DIR, URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale
+from gramps.gen.const import IMAGE_DIR, URL_MANUAL_PAGE
 from gramps.gen.config import config
 from gramps.gen.lib import NoteType
 from gramps.gen.datehandler import get_date

gramps/gui/displaystate.py

@@ -28,8 +28,6 @@
 #-------------------------------------------------------------------------
 import os
 from io import StringIO
-from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
@@ -54,6 +52,8 @@ from gi.repository import GLib
 # Gramps modules
 #
 #-------------------------------------------------------------------------
+from gramps.gen.const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
 from gramps.gen.utils.callback import Callback
 from .utils import process_pending_events
 from .views.navigationview import NavigationView
@@ -249,7 +249,6 @@ _RCT_TOP = '<ui><menubar name="MenuBar"><menu action="FileMenu"><menu action="Op
 _RCT_BTM = '</menu></menu></menubar></ui>'
 
 from gramps.gen.recentfiles import RecentFiles
-import os
 
 class RecentDocsMenu(object):
     def __init__(self, uistate, state, fileopen):

gramps/gui/editors/displaytabs/citationembedlist.py

@@ -43,7 +43,6 @@ from gi.repository import GObject, GLib
 #-------------------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
 from gramps.gen.lib import Citation, Source
-from gramps.gen.lib import Source, Citation
 from ...dbguielement import DbGUIElement
 from ...selectors import SelectorFactory
 from .citationrefmodel import CitationRefModel

gramps/gui/editors/editchildref.py

@@ -52,7 +52,6 @@ from gramps.gen.lib import NoteType
 from gramps.gen.errors import WindowActiveError
 from ..glade import Glade
 from ..ddtargets import DdTargets
-from gi.repository import Gdk
 from .displaytabs import CitationEmbedList, NoteTab
 from ..widgets import MonitoredDataType, PrivacyButton
 from gramps.gen.display.name import displayer as name_displayer

gramps/gui/plug/quick/_quicktable.py

@@ -45,7 +45,6 @@ from gi.repository import Gtk
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
 from gramps.gen.simple import SimpleTable
 from gramps.gen.errors import WindowActiveError

gramps/gui/views/treemodels/mediamodel.py

@@ -24,8 +24,6 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.translation.gettext
 import logging
 log = logging.getLogger(".")
 
@@ -41,9 +39,10 @@ from gi.repository import Gtk
 # Gramps modules
 #
 #-------------------------------------------------------------------------
+from gramps.gen.const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
 from gramps.gen.datehandler import displayer, format_time
 from gramps.gen.lib import Date, Media
-from gramps.gen.const import GRAMPS_LOCALE as glocale
 from .flatbasemodel import FlatBaseModel
 
 #-------------------------------------------------------------------------

gramps/gui/views/treemodels/peoplemodel.py

@@ -64,7 +64,6 @@ from .flatbasemodel import FlatBaseModel
 from .treebasemodel import TreeBaseModel
 from .basemodel import BaseModel
 from gramps.gen.config import config
-from gramps.gen.const import GRAMPS_LOCALE as glocale
 
 #-------------------------------------------------------------------------
 #

gramps/plugins/lib/maps/markerlayer.py

@@ -28,6 +28,7 @@
 import os
 from gi.repository import GObject
 from math import *
+import time
 
 #------------------------------------------------------------------------
 #
@@ -35,7 +36,8 @@ from math import *
 #
 #------------------------------------------------------------------------
 import logging
-_LOG = logging.getLogger("maps.marker")
+_LOG = logging.getLogger("maps.markerlayer")
+#_LOG = logging.getLogger("GeoGraphy.markerlayer")
 
 #-------------------------------------------------------------------------
 #
@@ -51,15 +53,6 @@ import cairo
 #
 #-------------------------------------------------------------------------
 
-#-------------------------------------------------------------------------
-#
-# set up logging
-#
-#-------------------------------------------------------------------------
-import time
-import logging
-_LOG = logging.getLogger("GeoGraphy.markerlayer")
-
 #-------------------------------------------------------------------------
 #
 # osmGpsMap