sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

some py3 related changes - passes checks on py2

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-24 16:04:35 +01:00
parent 866566172c
commit 3b7d75c994
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/views/statements.py
View File

@@ -472,7 +472,7 @@ from rowers.interactiveplots import *
from rowers.celery import result as celery_result from rowers.celery import result as celery_result
# Define the API documentation # Define the API documentation
#schema_view = get_swagger_view(title='Rowsandall API') schema_view = get_swagger_view(title='Rowsandall API')
def remove_asynctask(request,id): def remove_asynctask(request,id):
try: try:

4
rowsandall_app/settings.py
View File

@@ -378,8 +378,8 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': ( 'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.BasicAuthentication',
'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.SessionAuthentication',
# 'oauth2_provider.ext.rest_framework.OAuth2Authentication', 'oauth2_provider.ext.rest_framework.OAuth2Authentication',
'oauth2_provider.contrib.rest_framework.OAuth2Authentication', # 'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
), ),
'PAGE_SIZE': 20, 'PAGE_SIZE': 20,
'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination', 'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination',

34
rowsandall_app/urls.py
View File

@@ -35,26 +35,26 @@ handler500 = 'rowers.views.error500_view'
urlpatterns = [ urlpatterns = [
url('^', include('django.contrib.auth.urls')), url('^', include('django.contrib.auth.urls')),
url(r'^django-rq/',include('django_rq.urls')), url(r'^django-rq/',include('django_rq.urls')),
# url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), # url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
# url(r'^password_change/$',auth_views.password_change), url(r'^password_change/$',auth_views.password_change),
url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), # url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
url(r'^password_reset/$', url(r'^password_reset/$',
# auth_views.password_reset, auth_views.password_reset,
auth_views.PasswordResetView, # auth_views.PasswordResetView,
{'template_name': 'rowers/templates/registration/password_reset.html'}, {'template_name': 'rowers/templates/registration/password_reset.html'},
name='password_reset'), name='password_reset'),
url(r'^password_reset/done/$', url(r'^password_reset/done/$',
# auth_views.password_reset_done, auth_views.password_reset_done,
auth_views.PasswordResetDoneView, # auth_views.PasswordResetDoneView,
name='password_reset_done'), name='password_reset_done'),
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
# auth_views.password_reset_confirm, auth_views.password_reset_confirm,
auth_views.PasswordResetConfirmView, # auth_views.PasswordResetConfirmView,
name='password_reset_confirm'), name='password_reset_confirm'),
url(r'^reset/done/$', url(r'^reset/done/$',
# auth_views.password_reset_complete, auth_views.password_reset_complete,
auth_views.PasswordResetCompleteView, # auth_views.PasswordResetCompleteView,
name='password_reset_complete'), name='password_reset_complete'),
] ]
@@ -66,17 +66,17 @@ urlpatterns += [
url(r'^$',rootview), url(r'^$',rootview),
url(r'^getblogs/$',rowersviews.get_blog_posts), url(r'^getblogs/$',rowersviews.get_blog_posts),
url(r'^login/', url(r'^login/',
# auth_views.login, auth_views.login,
auth_views.LoginView, # auth_views.LoginView,
name='login'), name='login'),
url(r'^logout/$', url(r'^logout/$',
# auth_views.logout, auth_views.logout,
auth_views.LogoutView, # auth_views.LogoutView,
{'next_page': '/'}, {'next_page': '/'},
name='logout',), name='logout',),
url(r'^rowers/',include('rowers.urls')), url(r'^rowers/',include('rowers.urls')),
# url(r'^cvkbrno/',include('cvkbrno.urls')), # url(r'^cvkbrno/',include('cvkbrno.urls')),
# url(r'^admin/rq/',include('django_rq_dashboard.urls')), url(r'^admin/rq/',include('django_rq_dashboard.urls')),
url(r'^call\_back',rowersviews.rower_process_callback), url(r'^call\_back',rowersviews.rower_process_callback),
url(r'^stravacall\_back',rowersviews.rower_process_stravacallback), url(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback), url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),