diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py index 4dc5d069..171eff6c 100644 --- a/rowers/tests/mocks.py +++ b/rowers/tests/mocks.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import pytest pytestmark = pytest.mark.django_db diff --git a/rowers/tests/test_aavirtualevents.py b/rowers/tests/test_aavirtualevents.py index 2ca74dbb..88a8ab29 100644 --- a/rowers/tests/test_aavirtualevents.py +++ b/rowers/tests/test_aavirtualevents.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * from django.utils import timezone nu = datetime.datetime.now(tz=timezone.utc) @@ -408,7 +413,7 @@ class VirtualEventViewTest(TestCase): form = IndoorVirtualRaceForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -452,7 +457,7 @@ class VirtualEventViewTest(TestCase): form = IndoorVirtualRaceForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -496,7 +501,7 @@ class VirtualEventViewTest(TestCase): form = VirtualRaceForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -533,7 +538,7 @@ class VirtualEventViewTest(TestCase): form = VirtualRaceForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -588,7 +593,7 @@ class VirtualEventViewTest(TestCase): form = IndoorVirtualRaceResultForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -617,7 +622,7 @@ class VirtualEventViewTest(TestCase): form = IndoorVirtualRaceResultForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -666,7 +671,7 @@ class VirtualEventViewTest(TestCase): form = VirtualRaceResultForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) @@ -694,7 +699,7 @@ class VirtualEventViewTest(TestCase): form = VirtualRaceResultForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data,follow=True) diff --git a/rowers/tests/test_admin.py b/rowers/tests/test_admin.py index 49adf64a..12d19e94 100644 --- a/rowers/tests/test_admin.py +++ b/rowers/tests/test_admin.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() from rowers.models import User,Rower diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index 4cd8383f..421ded3a 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index 534aa8a4..7c70314a 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() @@ -211,7 +216,7 @@ class WorkoutViewTest(TestCase): 'userid':self.u.id, 'id':encoder.encode_hex(self.werg1.id), }) - print url + print(url) form_data = { 'xparam':'time', diff --git a/rowers/tests/test_basicrower.py b/rowers/tests/test_basicrower.py index 478011c2..4ab8d7b5 100644 --- a/rowers/tests/test_basicrower.py +++ b/rowers/tests/test_basicrower.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_courses.py b/rowers/tests/test_courses.py index e3c2779e..62364b18 100644 --- a/rowers/tests/test_courses.py +++ b/rowers/tests/test_courses.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * class CoursesTest(TestCase): def setUp(self): diff --git a/rowers/tests/test_cpchart.py b/rowers/tests/test_cpchart.py index bb013b03..9cbc5991 100644 --- a/rowers/tests/test_cpchart.py +++ b/rowers/tests/test_cpchart.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -from statements import * +from .statements import * nu = datetime.datetime.now() @@ -250,7 +254,7 @@ class CPChartTest(TestCase): sex = r.sex, weightc = r.weightcategory) - print url + print(url) response = self.c.get(url) self.assertEqual(response.status_code,200) diff --git a/rowers/tests/test_empower.py b/rowers/tests/test_empower.py index 4e9c836b..6fd66287 100644 --- a/rowers/tests/test_empower.py +++ b/rowers/tests/test_empower.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals #from __future__ import print_function -from statements import * +from .statements import * class EmpowerTest(TestCase): diff --git a/rowers/tests/test_errorpages.py b/rowers/tests/test_errorpages.py index cd9c23a0..6d973366 100644 --- a/rowers/tests/test_errorpages.py +++ b/rowers/tests/test_errorpages.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * #@pytest.mark.django_db diff --git a/rowers/tests/test_flexchart.py b/rowers/tests/test_flexchart.py index 0e764182..96ed9e52 100644 --- a/rowers/tests/test_flexchart.py +++ b/rowers/tests/test_flexchart.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * @override_settings(TESTING=True) class WorkoutViewTest(TestCase): @@ -120,7 +125,7 @@ class WorkoutViewTest(TestCase): form = FlexOptionsForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,form_data) diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index 28974cdb..645efdd3 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_interactivecharts.py b/rowers/tests/test_interactivecharts.py index ca59164a..2c9e7d1f 100644 --- a/rowers/tests/test_interactivecharts.py +++ b/rowers/tests/test_interactivecharts.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_misc.py b/rowers/tests/test_misc.py index 2e88f4c8..a755d944 100644 --- a/rowers/tests/test_misc.py +++ b/rowers/tests/test_misc.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_newusers.py b/rowers/tests/test_newusers.py index 2a7ecd72..429ea2e1 100644 --- a/rowers/tests/test_newusers.py +++ b/rowers/tests/test_newusers.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py index f07e45e0..0c14d696 100644 --- a/rowers/tests/test_payments.py +++ b/rowers/tests/test_payments.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() @@ -504,7 +509,7 @@ class PaymentTest(TestCase): form = BillingForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) login = self.c.login(username=u.username, password=self.password) diff --git a/rowers/tests/test_permissions.py b/rowers/tests/test_permissions.py index a84f7982..70c9f515 100644 --- a/rowers/tests/test_permissions.py +++ b/rowers/tests/test_permissions.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * from django.utils import timezone nu = datetime.datetime.now(tz=timezone.utc) @@ -391,7 +396,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) @@ -413,7 +418,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) @@ -649,7 +654,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) @@ -671,7 +676,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) @@ -786,7 +791,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) @@ -808,7 +813,7 @@ class PermissionsViewTests(TestCase): form = TeamForm(form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index 87f138c6..a786be3d 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() from rowers.utils import allmonths,allsundays @@ -78,7 +83,7 @@ class TrainingPlanTest(TestCase): for url in urls: if 'macrocycle' in url and 'delete' not in url: macrourl = url - print macrourl + print(macrourl) response = self.c.get(macrourl) self.assertEqual(response.status_code,200) @@ -106,7 +111,7 @@ class TrainingPlanTest(TestCase): for url in urls: if 'planbymonths' in url: - print url + print(url) response = self.c.get(url,follow=True) self.assertEqual(response.status_code,200) @@ -120,7 +125,7 @@ class TrainingPlanTest(TestCase): for url in urls: if 'planbyweeks' in url and not tested: - print url + print(url) response = self.c.get(url,follow=True) self.assertEqual(response.status_code,200) tested = True @@ -153,7 +158,7 @@ class TrainingPlanTest(TestCase): 'name': faker.word(), } - print 'posting to sessions/create' + print('posting to sessions/create') form = PlannedSessionForm(post_data) self.assertTrue(form.is_valid()) @@ -1407,17 +1412,17 @@ class PlannedSessionsView(TestCase): form = PlannedSessionForm(form_data,instance=self.ps_trimp) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) form = PlannedSessionTeamForm(self.u,form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) form = PlannedSessionTeamMemberForm(self.ps_trimp,form_data) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) response = self.c.post(url,follow=True) self.assertEqual(response.status_code,200) @@ -1555,7 +1560,7 @@ class PlannedSessionsView(TestCase): form = PlannedSessionForm(form_data,instance=self.ps_time) if not form.is_valid(): - print form.errors + print(form.errors) self.assertTrue(form.is_valid()) diff --git a/rowers/tests/test_rowerplans.py b/rowers/tests/test_rowerplans.py index df976bee..079c3742 100644 --- a/rowers/tests/test_rowerplans.py +++ b/rowers/tests/test_rowerplans.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() from rowers.views import hasplannedsessions,iscoachmember,ispromember diff --git a/rowers/tests/test_settings.py b/rowers/tests/test_settings.py index 7f38d0a1..1756ae46 100644 --- a/rowers/tests/test_settings.py +++ b/rowers/tests/test_settings.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * #@pytest.mark.django_db diff --git a/rowers/tests/test_simplefunctions.py b/rowers/tests/test_simplefunctions.py index be86cc16..a15d32a1 100644 --- a/rowers/tests/test_simplefunctions.py +++ b/rowers/tests/test_simplefunctions.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_staticcharts.py b/rowers/tests/test_staticcharts.py index 3e0c5590..6bc450df 100644 --- a/rowers/tests/test_staticcharts.py +++ b/rowers/tests/test_staticcharts.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_team.py b/rowers/tests/test_team.py index c1043d5c..eeb6f060 100644 --- a/rowers/tests/test_team.py +++ b/rowers/tests/test_team.py @@ -1,4 +1,9 @@ -from statements import * +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from .statements import * nu = datetime.datetime.now() @@ -138,9 +143,9 @@ class TeamTest(TestCase): if 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u: response = self.c.get(u) if response.status_code not in [200,302]: - print url - print u - print response.status_code + print(url) + print(u) + print(response.status_code) self.assertIn(response.status_code,[200,302]) login = self.c.login(username=self.users[1].username, @@ -157,9 +162,9 @@ class TeamTest(TestCase): if 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u: response = self.c.get(u) if response.status_code not in [200,302]: - print url - print u - print response.status_code + print(url) + print(u) + print(response.status_code) self.assertIn(response.status_code,[200,302]) def test_teamsview_manager(self): @@ -179,9 +184,9 @@ class TeamTest(TestCase): if 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u: response = self.c.get(u) if response.status_code not in [200,302]: - print url - print u - print response.status_code + print(url) + print(u) + print(response.status_code) self.assertIn(response.status_code,[200,302]) def test_teamview_member_request(self): diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py index 74083f91..ddc6300d 100644 --- a/rowers/tests/test_uploads.py +++ b/rowers/tests/test_uploads.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() from rowers.views import add_defaultfavorites diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index 269aca68..fc1c0b31 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py index d5c05f70..bc3cc9b4 100644 --- a/rowers/tests/test_user.py +++ b/rowers/tests/test_user.py @@ -1,5 +1,10 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + #from __future__ import print_function -from statements import * +from .statements import * nu = datetime.datetime.now() from rowingdata import rowingdata as rdata diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 68d08765..32fc4257 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ