From 6665ba2fe8dad4fb65ea8979b1916b4be0cb0759 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 25 Feb 2019 16:51:41 +0100
Subject: [PATCH] added future to views

---
 rowers/tests/testdata/testdata.csv.gz | Bin 12537 -> 12537 bytes
 rowers/utils.py                       |   3 ++-
 rowers/views/__init__.py              |   5 +++++
 rowers/views/analysisviews.py         |   4 ++++
 rowers/views/apiviews.py              |   5 +++++
 rowers/views/errorviews.py            |   5 +++++
 rowers/views/importviews.py           |   5 +++++
 rowers/views/otherviews.py            |   5 +++++
 rowers/views/paymentviews.py          |   4 ++++
 rowers/views/planviews.py             |   5 +++++
 rowers/views/racesviews.py            |   5 +++++
 rowers/views/teamviews.py             |   5 +++++
 rowers/views/userviews.py             |   5 +++++
 rowers/views/workoutviews.py          |   5 +++++
 rowsandall_app/settings.py            |   8 ++++++--
 15 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 0570901a29cbe11b63e7d40a68c41ed891bda966..68d08765f7bc42d0e3dbfcfd3903d13b541cb514 100644
GIT binary patch
delta 16
XcmeyF_%o4RzMF&NIA6&|_D==?JZ}b>

delta 16
XcmeyF_%o4RzMF$%+NYw8?4Jw(KxPL@

diff --git a/rowers/utils.py b/rowers/utils.py
index d87fe162..28e3cdd8 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
+
 import math
 import numpy as np
 import pandas as pd
@@ -497,7 +498,7 @@ def allmonths(startdate,enddate):
     d = startdate
     while d<enddate:
         yield d
-        d = datetime.date(d.year+(d.month / 12),((d.month % 12) + 1),1)
+        d = datetime.date(d.year+(d.month // 12),((d.month % 12) + 1),1)
 
 def allsundays(startdate,enddate):
     d = startdate
diff --git a/rowers/views/__init__.py b/rowers/views/__init__.py
index 848a9a00..1144c37c 100644
--- a/rowers/views/__init__.py
+++ b/rowers/views/__init__.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from .analysisviews import *
 from .apiviews import *
 from .errorviews import *
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 1bda5a80..2b379e43 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 from __future__ import unicode_literals, absolute_import
 from rowers.views.statements import *
 
diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 180e1e9a..7c8c16d5 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 
diff --git a/rowers/views/errorviews.py b/rowers/views/errorviews.py
index 2a46209f..eeaa7496 100644
--- a/rowers/views/errorviews.py
+++ b/rowers/views/errorviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 # Custom error pages with Rowsandall headers
diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py
index 5ae430da..a62fd840 100644
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 
diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py
index 4cd0ef48..d42a773b 100644
--- a/rowers/views/otherviews.py
+++ b/rowers/views/otherviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index b820b30d..61cba565 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 from rowers.views.statements import *
 
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index ba23042d..7c738167 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 @login_required()
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index c74e6059..5c177031 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 
diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py
index f8a8429e..226316d7 100644
--- a/rowers/views/teamviews.py
+++ b/rowers/views/teamviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 74ff1b49..a8aea814 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 
 @login_required()
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 120683d9..5e43b988 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from rowers.views.statements import *
 import rowers.teams as teams
 
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 9e4656ca..7ed2db2e 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 """
 Django settings for rowsandall_app project.
@@ -43,7 +47,7 @@ ALLOWED_HOSTS = CFG['allowed_hosts']
 
 INSTALLED_APPS = [
     'rowers',
-    'cvkbrno',
+#    'cvkbrno',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -199,7 +203,7 @@ TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')
 
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),    
-    os.path.join(BASE_DIR, 'cvkbrno/locale'),    
+#    os.path.join(BASE_DIR, 'cvkbrno/locale'),    
     )
 
 LANGUAGES = (