GEPS008: Modify gen.utils imports

svn: r19811

src/gen/filters/rules/place/_inlatlonneighborhood.py

@@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
 #
 #-------------------------------------------------------------------------
 from gen.filters.rules import Rule
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 
 #-------------------------------------------------------------------------
 #

src/gen/utils/__init__.py

@@ -28,4 +28,3 @@ Generic utilities useful for users of the gen package
 from callback import Callback
 from configmanager import ConfigManager
 from fallback import *
-from place import conv_lat_lon

src/gui/editors/editplace.py

@@ -51,7 +51,7 @@ from displaytabs import (GrampsTab, LocationEmbedList, CitationEmbedList,
                          GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList)
 from gui.widgets import MonitoredEntry, PrivacyButton
 from gen.errors import ValidationError
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.dialog import ErrorDialog
 from gui.glade import Glade
 

src/gui/views/treemodels/placemodel.py

@@ -47,7 +47,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import Utils
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 from gui.views.treemodels.treebasemodel import TreeBaseModel
 

src/plugins/export/ExportGedcom.py

@@ -48,7 +48,7 @@ from gen.errors import DatabaseError
 from gui.plug.export import WriterOptionBox
 from gen.updatecallback import UpdateCallback
 from Utils import media_path_full
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 
 #-------------------------------------------------------------------------
 #

src/plugins/gramplet/EditExifMetadata.py

@@ -65,7 +65,7 @@ from gen.lib import Date
 
 import gen.mime
 import Utils
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 
 from gen.db import DbTxn
 

src/plugins/gramplet/PlaceDetails.py

@@ -22,7 +22,7 @@
 from gen.plug import Gramplet
 from gui.widgets import Photo
 from gen.ggettext import gettext as _
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 import Utils
 import gtk
 import pango

src/plugins/lib/libmapservice.py

@@ -35,7 +35,7 @@ Base class for map services. Example: open place in openstreetmap.org
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.display import display_url
 
 class MapService():

src/plugins/lib/libmetadata.py

@@ -24,7 +24,7 @@
 
 from gui.listmodel import ListModel
 from gen.ggettext import gettext as _
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from fractions import Fraction
 import gen.lib
 import gen.datehandler

src/plugins/view/geoclose.py

@@ -52,7 +52,7 @@ import gen.lib
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.navigationview import NavigationView
 from gui.views.bookmarks import PersonBookmarks
 from maps import constants

src/plugins/view/geoevents.py

@@ -59,7 +59,7 @@ import Utils
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.pageview import PageView
 from gui.editors import EditPlace
 from gui.selectors.selectplace import SelectPlace

src/plugins/view/geofamclose.py

@@ -52,7 +52,7 @@ import gen.lib
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.navigationview import NavigationView
 from gui.views.bookmarks import FamilyBookmarks
 from maps import constants

src/plugins/view/geofamily.py

@@ -59,7 +59,7 @@ import Utils
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.pageview import PageView
 from gui.editors import EditPlace
 from gui.selectors.selectplace import SelectPlace

src/plugins/view/geomoves.py

@@ -55,7 +55,7 @@ import gen.lib
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.navigationview import NavigationView
 from gui.views.bookmarks import PersonBookmarks
 from maps import constants

src/plugins/view/geoperson.py

@@ -60,7 +60,7 @@ import Utils
 from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.pageview import PageView
 from gui.editors import EditPlace
 from gui.selectors.selectplace import SelectPlace

src/plugins/view/geoplaces.py

@@ -59,7 +59,7 @@ import gen.lib
 import Utils
 from gen.config import config
 from gen.display.name import displayer as _nd
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.views.pageview import PageView
 from gui.editors import EditPlace
 from gui.selectors.selectplace import SelectPlace

src/plugins/webreport/NarrativeWeb.py

@@ -105,7 +105,7 @@ from libhtml import Html
 from libhtmlbackend import HtmlBackend, process_spaces
 
 from libgedcom import make_gedcom_date
-from gen.utils import conv_lat_lon
+from gen.utils.place import conv_lat_lon
 from gui.pluginmanager import GuiPluginManager
 
 from gen.relationship import get_relationship_calculator