Move sport module to pytrainer.core package

ticket:143

pytrainer/gui/windowprofile.py

@@ -21,7 +21,7 @@
 from windowcalendar import WindowCalendar
 from pytrainer.core.equipment import EquipmentService
 from pytrainer.gui.equipment import EquipmentUi
-from pytrainer.sport import Sport
+from pytrainer.core.sport import Sport
 import gtk
 import gobject
 import logging

pytrainer/main.py

@@ -41,7 +41,7 @@
 from importdata import Importdata
 from plugins import Plugins
 from profile import Profile
-from pytrainer.sport import SportService
+from pytrainer.core.sport import SportService
 from athlete import Athlete
 from stats import Stats
 

pytrainer/record.py

@@ -29,7 +29,7 @@
 from lib.date import Date
 from lib.gpx import Gpx
 from pytrainer.core.equipment import EquipmentService
-from pytrainer.sport import Sport
+from pytrainer.core.sport import Sport
 
 class Record:
 	def __init__(self, sport_service, data_path = None, parent = None):

pytrainer/test/sport_test.py → pytrainer/test/core/sport_test.py

@@ -17,10 +17,10 @@
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import unittest
-from pytrainer.sport import Sport, SportService, SportServiceException
+from pytrainer.core.sport import Sport, SportService, SportServiceException
 import mock
 from pytrainer.lib.sqliteUtils import Sql
-import pytrainer
+import pytrainer.core
 
 class SportTest(unittest.TestCase):
 
@@ -289,7 +289,7 @@ def test_store_sport_should_error_when_new_sport_has_duplicate_name(self):
 
     def test_store_sport_should_error_when_existing_sport_has_duplicate_name(self):
         def mock_select(table, columns, where):
-            if columns == pytrainer.sport._ID_COLUMN:
+            if columns == pytrainer.core.sport._ID_COLUMN:
                 return [[2]]
             else:
                 return [(1, u"Test name", 0, 0.0, "0"), (2, u"New name", 0, 0.0, "0")]