Merge pull request #16775 from edx/jeskew/test_migrations_in_d111

Fix warnings/errors in Django 1.10

cms/urls.py

@@ -46,7 +46,7 @@ urlpatterns = [
     # noop to squelch ajax errors
     url(r'^event$', contentstore.views.event, name='event'),
     url(r'^xmodule/', include('pipeline_js.urls')),
-    url(r'^heartbeat$', include('openedx.core.djangoapps.heartbeat.urls')),
+    url(r'^heartbeat', include('openedx.core.djangoapps.heartbeat.urls')),
     url(r'^user_api/', include('openedx.core.djangoapps.user_api.legacy_urls')),
     url(r'^i18n/', include('django.conf.urls.i18n')),
 

common/djangoapps/course_modes/migrations/0010_archived_suggested_prices_to_charfield.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import re
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course_modes', '0009_suggested_prices_to_charfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='coursemodesarchive',
+            name='suggested_prices',
+            field=models.CharField(default=b'', max_length=255, blank=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\d,]+\\Z'), 'Enter only digits separated by commas.', 'invalid')]),
+        ),
+    ]

common/djangoapps/course_modes/models.py

@@ -810,7 +810,8 @@ class CourseModesArchive(models.Model):
     min_price = models.IntegerField(default=0)
 
     # the suggested prices for this mode
-    suggested_prices = models.CommaSeparatedIntegerField(max_length=255, blank=True, default='')
+    suggested_prices = models.CharField(max_length=255, blank=True, default='',
+                                        validators=[validate_comma_separated_integer_list])
 
     # the currency these prices are in, using lower case ISO currency codes
     currency = models.CharField(default="usd", max_length=8)

lms/djangoapps/edxnotes/urls.py

@@ -7,8 +7,8 @@ from edxnotes import views
 
 # Additionally, we include login URLs for the browseable API.
 urlpatterns = [
-    url(r"^/$", views.edxnotes, name="edxnotes"),
-    url(r"^/notes/$", views.notes, name="notes"),
-    url(r"^/token/$", views.get_token, name="get_token"),
-    url(r"^/visibility/$", views.edxnotes_visibility, name="edxnotes_visibility"),
+    url(r"^$", views.edxnotes, name="edxnotes"),
+    url(r"^notes/$", views.notes, name="notes"),
+    url(r"^token/$", views.get_token, name="get_token"),
+    url(r"^visibility/$", views.edxnotes_visibility, name="edxnotes_visibility"),
 ]

lms/djangoapps/teams/urls.py

@@ -8,5 +8,5 @@ from django.contrib.auth.decorators import login_required
 from .views import TeamsDashboardView
 
 urlpatterns = [
-    url(r"^/$", login_required(TeamsDashboardView.as_view()), name="teams_dashboard")
+    url(r"^$", login_required(TeamsDashboardView.as_view()), name="teams_dashboard")
 ]

lms/urls.py

@@ -72,7 +72,7 @@ urlpatterns = [
     # Static template view endpoints like blog, faq, etc.
     url(r'', include('static_template_view.urls')),
 
-    url(r'^heartbeat$', include('openedx.core.djangoapps.heartbeat.urls')),
+    url(r'^heartbeat', include('openedx.core.djangoapps.heartbeat.urls')),
 
     # Note: these are older versions of the User API that will eventually be
     # subsumed by api/user listed below.
@@ -634,7 +634,7 @@ urlpatterns += [
 
     # Student Notes
     url(
-        r'^courses/{}/edxnotes'.format(
+        r'^courses/{}/edxnotes/'.format(
             settings.COURSE_ID_PATTERN,
         ),
         include('edxnotes.urls'),
@@ -686,7 +686,7 @@ if settings.FEATURES['ENABLE_TEAMS']:
             include('lms.djangoapps.teams.api_urls')
         ),
         url(
-            r'^courses/{}/teams'.format(
+            r'^courses/{}/teams/'.format(
                 settings.COURSE_ID_PATTERN,
             ),
             include('lms.djangoapps.teams.urls'),