Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 390b697

Browse files
thalladathallada
authored
Merge pull request #137 from edx/thallada/django-1.9-upgrade
Upgrade to Django 1.9
2 parents c9a9e49 + 66fa8c4 commit 390b697

17 files changed

Lines changed: 79 additions & 89 deletions

File tree

‎analytics_data_api/urls.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from django.conf.urls import patterns, url, include
1+
from django.conf.urls import url, include
22
from rest_framework.urlpatterns import format_suffix_patterns
33

4-
urlpatterns = patterns(
5-
'',
6-
url(r'^v0/', include('analytics_data_api.v0.urls', namespace='v0')),
7-
)
4+
urlpatterns = [
5+
url(r'^v0/', include('analytics_data_api.v0.urls', 'v0')),
6+
]
87

98
urlpatterns = format_suffix_patterns(urlpatterns)

‎analytics_data_api/v0/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
from django.conf import settings
33
from elasticsearch_dsl import connections
44

5-
from analytics_data_api.utils import load_fully_qualified_definition
6-
75

86
class ApiAppConfig(AppConfig):
97

108
name = 'analytics_data_api.v0'
119

1210
def ready(self):
11+
from analytics_data_api.utils import load_fully_qualified_definition
12+
1313
super(ApiAppConfig, self).ready()
1414
if settings.ELASTICSEARCH_LEARNERS_HOST:
1515
connection_params = {'hosts': [settings.ELASTICSEARCH_LEARNERS_HOST]}

‎analytics_data_api/v0/tests/test_connections.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_signing(self):
3333
self.assertTrue('my_access_key' in auth_header)
3434

3535
def test_timeout(self):
36-
def fake_connection(_address):
36+
def fake_connection(*args): # pylint: disable=unused-argument
3737
raise socket.timeout('fake error')
3838
socket.create_connection = fake_connection
3939
connection = ESConnection('mockservice.cc-zone-1.amazonaws.com',

‎analytics_data_api/v0/tests/test_urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class UrlRedirectTests(TestCase):
66
api_root_path = '/api/v0/'
77

88
def assertRedirectsToRootPath(self, path, **kwargs):
9-
assert_kwargs = {'status_code': 301}
9+
assert_kwargs = {'status_code': 302}
1010
assert_kwargs.update(kwargs)
1111

1212
p = '{0}{1}/'.format(self.api_root_path, path)

‎analytics_data_api/v0/urls/__init__.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
from django.conf.urls import patterns, url, include
1+
from django.conf.urls import url, include
22
from django.core.urlresolvers import reverse_lazy
33
from django.views.generic import RedirectView
44

55
COURSE_ID_PATTERN = r'(?P<course_id>[^/+]+[/+][^/+]+[/+][^/]+)'
66

7-
urlpatterns = patterns(
8-
'',
9-
url(r'^courses/', include('analytics_data_api.v0.urls.courses', namespace='courses')),
10-
url(r'^problems/', include('analytics_data_api.v0.urls.problems', namespace='problems')),
11-
url(r'^videos/', include('analytics_data_api.v0.urls.videos', namespace='videos')),
12-
url('^', include('analytics_data_api.v0.urls.learners', namespace='learners')),
7+
urlpatterns = [
8+
url(r'^courses/', include('analytics_data_api.v0.urls.courses', 'courses')),
9+
url(r'^problems/', include('analytics_data_api.v0.urls.problems', 'problems')),
10+
url(r'^videos/', include('analytics_data_api.v0.urls.videos', 'videos')),
11+
url('^', include('analytics_data_api.v0.urls.learners', 'learners')),
1312

1413
# pylint: disable=no-value-for-parameter
1514
url(r'^authenticated/$', RedirectView.as_view(url=reverse_lazy('authenticated')), name='authenticated'),
1615
url(r'^health/$', RedirectView.as_view(url=reverse_lazy('health')), name='health'),
1716
url(r'^status/$', RedirectView.as_view(url=reverse_lazy('status')), name='status'),
18-
)
17+
]

‎analytics_data_api/v0/urls/courses.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22

33
from analytics_data_api.v0.urls import COURSE_ID_PATTERN
44
from analytics_data_api.v0.views import courses as views
@@ -21,4 +21,4 @@
2121

2222
for path, view, name in COURSE_URLS:
2323
regex = r'^{0}/{1}/$'.format(COURSE_ID_PATTERN, path)
24-
urlpatterns += patterns('', url(regex, view.as_view(), name=name))
24+
urlpatterns.append(url(regex, view.as_view(), name=name))

‎analytics_data_api/v0/urls/learners.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22

33
from analytics_data_api.v0.urls import COURSE_ID_PATTERN
44
from analytics_data_api.v0.views import learners as views
55

66
USERNAME_PATTERN = r'(?P<username>[\w.+-]+)'
77

8-
urlpatterns = patterns(
9-
'',
8+
urlpatterns = [
109
url(r'^learners/$', views.LearnerListView.as_view(), name='learners'),
1110
url(r'^learners/{}/$'.format(USERNAME_PATTERN), views.LearnerView.as_view(), name='learner'),
1211
url(r'^engagement_timelines/{}/$'.format(USERNAME_PATTERN),
1312
views.EngagementTimelineView.as_view(), name='engagement_timelines'),
1413
url(r'^course_learner_metadata/{}/$'.format(COURSE_ID_PATTERN),
1514
views.CourseLearnerMetadata.as_view(), name='course_learner_metadata'),
16-
)
15+
]

‎analytics_data_api/v0/urls/problems.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
from django.conf.urls import patterns, url
3+
from django.conf.urls import url
44

55
from analytics_data_api.v0.views import problems as views
66

@@ -9,11 +9,10 @@
99
('grade_distribution', views.GradeDistributionView, 'grade_distribution'),
1010
]
1111

12-
urlpatterns = patterns(
13-
'',
12+
urlpatterns = [
1413
url(r'^(?P<module_id>.+)/sequential_open_distribution/$',
1514
views.SequentialOpenDistributionView.as_view(), name='sequential_open_distribution'),
16-
)
15+
]
1716

1817
for path, view, name in PROBLEM_URLS:
19-
urlpatterns += patterns('', url(r'^(?P<problem_id>.+)/' + re.escape(path) + r'/$', view.as_view(), name=name))
18+
urlpatterns.append(url(r'^(?P<problem_id>.+)/' + re.escape(path) + r'/$', view.as_view(), name=name))

‎analytics_data_api/v0/urls/videos.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
from django.conf.urls import patterns, url
3+
from django.conf.urls import url
44

55
from analytics_data_api.v0.views import videos as views
66

@@ -11,4 +11,4 @@
1111
urlpatterns = []
1212

1313
for path, view, name in VIDEO_URLS:
14-
urlpatterns += patterns('', url(r'^(?P<video_id>.+)/' + re.escape(path) + r'/$', view.as_view(), name=name))
14+
urlpatterns.append(url(r'^(?P<video_id>.+)/' + re.escape(path) + r'/$', view.as_view(), name=name))

‎analyticsdataserver/settings/base.py‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
########## DEBUG CONFIGURATION
2121
# See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
2222
DEBUG = False
23-
24-
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
25-
TEMPLATE_DEBUG = DEBUG
2623
########## END DEBUG CONFIGURATION
2724

2825

@@ -140,28 +137,28 @@
140137

141138

142139
########## TEMPLATE CONFIGURATION
143-
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
144-
TEMPLATE_CONTEXT_PROCESSORS = (
145-
'django.contrib.auth.context_processors.auth',
146-
'django.core.context_processors.debug',
147-
'django.core.context_processors.i18n',
148-
'django.core.context_processors.media',
149-
'django.core.context_processors.static',
150-
'django.core.context_processors.tz',
151-
'django.contrib.messages.context_processors.messages',
152-
'django.core.context_processors.request',
153-
)
154-
155-
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
156-
TEMPLATE_LOADERS = (
157-
'django.template.loaders.filesystem.Loader',
158-
'django.template.loaders.app_directories.Loader',
159-
)
160-
161-
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
162-
TEMPLATE_DIRS = (
163-
normpath(join(SITE_ROOT, 'templates')),
164-
)
140+
# See: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-TEMPLATES
141+
TEMPLATES = [
142+
{
143+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
144+
'DIRS': [
145+
normpath(join(SITE_ROOT, 'templates')),
146+
],
147+
'APP_DIRS': True,
148+
'OPTIONS': {
149+
'context_processors': [
150+
'django.contrib.auth.context_processors.auth',
151+
'django.template.context_processors.debug',
152+
'django.template.context_processors.i18n',
153+
'django.template.context_processors.media',
154+
'django.template.context_processors.static',
155+
'django.template.context_processors.tz',
156+
'django.contrib.messages.context_processors.messages',
157+
'django.template.context_processors.request',
158+
],
159+
},
160+
}
161+
]
165162
########## END TEMPLATE CONFIGURATION
166163

167164

0 commit comments

Comments
 (0)