Commit aeb3a2b4 by Ahsan Ulhaq Committed by Ahsan Ul Haq

Upgrade django to latest version

LEARNER-1306
parent 2d7ba9e8
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.test.factories import UserFactory
from ecommerce.core.constants import USER_LIST_VIEW_SWITCH
......
......@@ -5,9 +5,9 @@ import mock
from auth_backends.tests.mixins import LogoutViewTestMixin
from django.conf import settings
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.db import DatabaseError
from django.test.utils import override_settings
from django.urls import reverse
from rest_framework import status
from ecommerce.core.constants import Status
......
......@@ -6,7 +6,7 @@ import httpretty
import mock
import pytz
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.timezone import now
from factory.fuzzy import FuzzyText
from oscar.core.loading import get_class, get_model
......
......@@ -6,9 +6,9 @@ import logging
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import render
from django.urls import reverse
from django.utils import timezone
from django.utils.decorators import method_decorator
from django.utils.text import slugify
......
......@@ -3,7 +3,7 @@ import json
import ddt
import httpretty
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from testfixtures import LogCapture
from ecommerce.core.constants import ENROLLMENT_CODE_SWITCH
......
......@@ -9,7 +9,7 @@ from datetime import timedelta
import ddt
import httpretty
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils import timezone
from oscar.core.loading import get_model
from oscar.test.factories import RangeFactory
......
......@@ -13,8 +13,8 @@ from urllib import urlencode
from django.conf import settings
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.urls import reverse
from oscar.core.loading import get_model
from requests.exceptions import ConnectionError, Timeout
from slumber.exceptions import SlumberBaseException
......
{% extends 'edx/base.html' %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% if editing %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load offer_tags %}
{% load staticfiles %}
{% load static %}
{% block title %}{% trans "Enterprise Offers" %}{% endblock %}
......
import uuid
import httpretty
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.enterprise.benefits import EnterprisePercentageDiscountBenefit
......
......@@ -9,7 +9,7 @@ from urllib import urlencode
import waffle
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext as _
from edx_rest_api_client.client import EdxRestApiClient
from oscar.core.loading import get_model
......
......@@ -2,7 +2,7 @@
import logging
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.views.generic import CreateView, ListView, UpdateView
from oscar.core.loading import get_model
......
from django.core.urlresolvers import reverse
from django.test import RequestFactory
from django.urls import reverse
from oscar.core.loading import get_class, get_model
from oscar.test.factories import ProductAttributeValueFactory
......
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.courses.tests.factories import CourseFactory
......
......@@ -11,8 +11,8 @@ import ddt
import httpretty
import mock
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.test import override_settings
from django.urls import reverse
from oscar.core.loading import get_model
from oscar.test import factories
from oscar.test.factories import BasketFactory
......
......@@ -3,7 +3,7 @@ import json
import ddt
import httpretty
import mock
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from requests.exceptions import ConnectionError, Timeout
from slumber.exceptions import SlumberBaseException
......
......@@ -3,8 +3,8 @@ from __future__ import unicode_literals
import json
from django.conf import settings
from django.core.urlresolvers import reverse
from django.test import override_settings
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.core.tests import toggle_switch
......
......@@ -9,8 +9,8 @@ from uuid import uuid4
import ddt
import httpretty
import pytz
from django.core.urlresolvers import reverse
from django.test import RequestFactory
from django.urls import reverse
from django.utils.timezone import now
from oscar.apps.catalogue.categories import create_from_breadcrumbs
from oscar.core.loading import get_class, get_model
......
......@@ -6,7 +6,7 @@ import jwt
import mock
from django.conf import settings
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_class, get_model
from ecommerce.core.constants import ISO_8601_FORMAT, SEAT_PRODUCT_CLASS_NAME
......
......@@ -2,7 +2,7 @@ from __future__ import unicode_literals
import httpretty
import mock
from django.core.urlresolvers import reverse
from django.urls import reverse
from ecommerce.enterprise.tests.mixins import EnterpriseServiceMockMixin
from ecommerce.tests.testcases import TestCase
......
......@@ -4,8 +4,8 @@ import ddt
import httpretty
import mock
from django.contrib.auth.models import Permission
from django.core.urlresolvers import reverse
from django.test import RequestFactory, override_settings
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.extensions.api.serializers import OrderSerializer
......
import json
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.tests.factories import PartnerFactory
......
......@@ -2,8 +2,8 @@ import json
from django.conf import settings
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.test import override_settings
from django.urls import reverse
from waffle.models import Switch
from ecommerce.core.models import SiteConfiguration
......
......@@ -4,8 +4,8 @@ import datetime
import json
import pytz
from django.core.urlresolvers import reverse
from django.test import RequestFactory
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.core.constants import COUPON_PRODUCT_CLASS_NAME, COURSE_ENTITLEMENT_PRODUCT_CLASS_NAME
......
......@@ -2,7 +2,7 @@ import json
import ddt
import httpretty
from django.core.urlresolvers import reverse
from django.urls import reverse
from rest_framework import status
from ecommerce.extensions.api.serializers import ProviderSerializer
......
......@@ -5,7 +5,7 @@ from decimal import Decimal
import mock
import pytz
from django.core.urlresolvers import reverse
from django.urls import reverse
from freezegun import freeze_time
from oscar.core.loading import get_model
......
......@@ -3,7 +3,7 @@ import json
import ddt
import httpretty
import mock
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from rest_framework import status
......
......@@ -2,7 +2,7 @@ import json
import ddt
import mock
from django.core.urlresolvers import reverse
from django.urls import reverse
from requests.exceptions import HTTPError, Timeout
from rest_framework import status
......
import json
from django.contrib.auth.models import Permission
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.courses.tests.factories import CourseFactory
......
......@@ -6,8 +6,8 @@ import ddt
import httpretty
import mock
import pytz
from django.core.urlresolvers import reverse
from django.http import Http404
from django.urls import reverse
from django.utils.timezone import now
from opaque_keys.edx.keys import CourseKey
from oscar.core.loading import get_model
......
......@@ -10,9 +10,9 @@ import pytz
from django.conf import settings
from django.contrib.messages import get_messages
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.test import override_settings
from django.urls import reverse
from factory.fuzzy import FuzzyText
from oscar.apps.basket.forms import BasketVoucherForm
from oscar.core.loading import get_class, get_model
......
......@@ -4,7 +4,7 @@ from decimal import Decimal
import ddt
import httpretty
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from oscar.test import factories
......
......@@ -3,7 +3,7 @@ import urllib
from babel.numbers import format_currency as default_format_currency
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import get_language, to_locale
from edx_rest_api_client.client import EdxRestApiClient
from requests.exceptions import ConnectionError, Timeout
......
......@@ -2,8 +2,8 @@ import os
from unittest import skipIf
from django.contrib.messages import constants as MSG
from django.core.urlresolvers import reverse
from django.test import override_settings
from django.urls import reverse
from nose.plugins.skip import SkipTest
from oscar.core.loading import get_model
from oscar.test import factories
......
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from oscar.apps.dashboard.orders.views import OrderDetailView as CoreOrderDetailView
......
......@@ -2,7 +2,7 @@ import os
from unittest import skip
import ddt
from django.core.urlresolvers import reverse
from django.urls import reverse
from nose.plugins.skip import SkipTest
from oscar.core.loading import get_model
from oscar.test import factories
......
from django.core.urlresolvers import reverse
from django.urls import reverse
from ecommerce.extensions.refund.status import REFUND
from ecommerce.extensions.refund.tests.factories import RefundFactory
......
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.test.factories import OrderFactory, UserFactory
from ecommerce.tests.testcases import TestCase
......
......@@ -3,7 +3,7 @@ import json
import httpretty
import mock
from django.contrib.messages import constants as MSG
from django.core.urlresolvers import reverse
from django.urls import reverse
from requests import Timeout
from testfixtures import LogCapture
......
......@@ -10,7 +10,7 @@ import logging
import requests
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from edx_rest_api_client.client import EdxRestApiClient
from oscar.core.loading import get_model
from requests.exceptions import ConnectionError, Timeout # pylint: disable=ungrouped-imports
......
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.test.factories import UserFactory
from ecommerce.core.tests import toggle_switch
......
......@@ -9,7 +9,7 @@ import uuid
from decimal import Decimal
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.apps.payment.exceptions import GatewayError, TransactionDeclined, UserCancelled
from oscar.core.loading import get_class
from zeep import Client
......
......@@ -10,7 +10,7 @@ from urlparse import urljoin
import paypalrestsdk
import waffle
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.functional import cached_property
from django.utils.translation import get_language
from oscar.apps.payment.exceptions import GatewayError
......
......@@ -10,7 +10,7 @@ import ddt
import mock
import responses
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from factory.django import mute_signals
from oscar.apps.order.exceptions import UnableToPlaceOrder
from oscar.apps.payment.exceptions import PaymentError, TransactionDeclined, UserCancelled
......
......@@ -11,8 +11,8 @@ import mock
import paypalrestsdk
import responses
from django.conf import settings
from django.core.urlresolvers import reverse
from django.test import RequestFactory
from django.urls import reverse
from django.utils import translation
from factory.fuzzy import FuzzyInteger
from oscar.apps.payment.exceptions import GatewayError
......
from django.conf import settings
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.urls import reverse
from waffle.models import Switch
from ecommerce.extensions.api.v2.views.payments import PAYMENT_PROCESSOR_CACHE_KEY
......
......@@ -7,7 +7,7 @@ import ddt
import mock
import responses
from django.conf import settings
from django.core.urlresolvers import reverse
from django.urls import reverse
from freezegun import freeze_time
from oscar.apps.payment.exceptions import TransactionDeclined
from oscar.core.loading import get_class, get_model
......
......@@ -4,8 +4,8 @@ from __future__ import unicode_literals
import ddt
import mock
import responses
from django.core.urlresolvers import reverse
from django.test.client import RequestFactory
from django.urls import reverse
from oscar.apps.order.exceptions import UnableToPlaceOrder
from oscar.apps.payment.exceptions import PaymentError
from oscar.core.loading import get_class, get_model
......
from django.core.urlresolvers import reverse
from django.urls import reverse
from ecommerce.tests.testcases import TestCase
......
......@@ -7,10 +7,10 @@ import six
import waffle
from django.contrib import messages
from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse
from django.db import transaction
from django.http import JsonResponse
from django.shortcuts import redirect
from django.urls import reverse
from django.utils.decorators import method_decorator
from django.utils.functional import cached_property
from django.utils.safestring import mark_safe
......
......@@ -10,7 +10,7 @@ import dateutil.parser
import pytz
from django.conf import settings
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from opaque_keys.edx.keys import CourseKey
from oscar.core.loading import get_model
......
{% extends 'edx/base.html' %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% if editing %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load offer_tags %}
{% load staticfiles %}
{% load static %}
{% block title %}{% trans "Program Offers" %}{% endblock %}
......
import uuid
import httpretty
from django.core.urlresolvers import reverse
from django.urls import reverse
from oscar.core.loading import get_model
from ecommerce.extensions.test import factories
......
import logging
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.views.generic import CreateView, ListView, UpdateView
from oscar.core.loading import get_model
......
......@@ -8,6 +8,7 @@ from ecommerce.settings.base import *
SITE_ID = 1
PROTOCOL = 'http'
ALLOWED_HOSTS = ['*']
# TEST SETTINGS
INSTALLED_APPS += (
......
......@@ -5,8 +5,8 @@ from calendar import timegm
import httpretty
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.test import override_settings
from django.urls import reverse
from jwkest.jwk import SYMKey
from jwkest.jws import JWS
from social_django.models import DjangoStorage
......
{% load i18n %}
{% load staticfiles %}
{% load static %}
<!DOCTYPE html>
<!--[if lt IE 7]> <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}{% trans "Coupon Codes" %}{% endblock %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}{% trans "Redeem" %}{% endblock %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}{% trans "Courses" %}{% endblock %}
......
......@@ -3,7 +3,7 @@
{% load compress %}
{% load core_extras %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
<!DOCTYPE html>
<html lang={{ LANGUAGE_CODE }}>
......
......@@ -4,7 +4,7 @@
{% load i18n %}
{% load l10n %}
{% load offer_tags %}
{% load staticfiles %}
{% load static %}
{% load enterprise %}
{% block title %}
......
{% extends 'edx/base.html' %}
{% load core_extras %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block title %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}{% endblock %}
......
{% load i18n %}
{% load staticfiles %}
{% load static %}
<header class="navbar navbar-default">
<div class="container">
......
{% extends 'edx/partials/_base_navbar.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block navbar_brand %}
{% if admin == "course" %}
......
{% extends 'edx/partials/_base_navbar.html' %}
{% load staticfiles %}
{% load static %}
{% block navbar_brand %}
<h1 class="navbar-brand">
......
......@@ -2,7 +2,7 @@
{% load core_extras %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% trans 'Basket' %}
......
......@@ -3,7 +3,7 @@
{% load crispy_forms_tags %}
{% load offer_tags %}
{% load widget_tweaks %}
{% load staticfiles %}
{% load static %}
{% include 'partials/alert_messages.html' %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% trans "Checkout Cancelled" %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% trans "Checkout Error" %}
......
{% extends 'edx/base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% block title %}
{% trans "Payment Failed" %}
......
{% extends 'dashboard/layout.html' %}
{% load i18n %}
{% load thumbnail %}
{% load staticfiles %}
{% load static %}
{% load form_tags %}
......
{% extends 'dashboard/layout.html' %}
{% load i18n %}
{% load compress %}
{% load staticfiles %}
{% load static %}
{% load currency_filters %}
{% block body_class %}{{ block.super }} orders{% endblock %}
......
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load currency_filters %}
{% load staticfiles %}
{% load static %}
{% load sorting_tags %}
{% load i18n %}
......
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load staticfiles %}
{% load static %}
{% load currency_filters %}
{% load i18n %}
......
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load staticfiles %}
{% load static %}
{% load currency_filters %}
{% load sorting_tags %}
{% load i18n %}
......
{% load staticfiles %}
{% load static %}
{# NOTE: Using compress tags here results in the JS not being loaded. #}
......
{% load compress %}
{% load staticfiles %}
{% load static %}
{# NOTE: We use Stripe v2 for credit card payments since v3 requires using Elements, which would force us #}
{# to make a custom payment form just for Stripe. Using v2 allows us to continue using the same payment form #}
......
......@@ -2,7 +2,7 @@
{% load compress %}
{% load core_extras %}
{% load staticfiles %}
{% load static %}
{% block title %}edX E-Commerce API {{ swagger_settings.api_version }}{% endblock %}
......
......@@ -11,7 +11,7 @@ from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.sites.models import Site
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.timezone import now
from mock import patch
from oscar.core.loading import get_class, get_model
......
from django.core.urlresolvers import reverse
from django.urls import reverse
from ecommerce.core.url_utils import get_lms_dashboard_url
from ecommerce.tests.testcases import TestCase
......
......@@ -2,7 +2,7 @@
Tests for theming middleware.
"""
from django.core.urlresolvers import reverse
from django.urls import reverse
from ecommerce.tests.testcases import TestCase
......
......@@ -6,10 +6,10 @@
-e git+https://github.com/edx/analytics-python.git@1.2.11#egg=analytics-python==1.2.11
coreapi==2.3.1
django==1.10.7
django==1.11.9
django-compressor==2.2
django-crispy-forms==1.6.1
django_extensions==1.9.0
django-crispy-forms==1.7.0
django_extensions==1.9.9
django-filter==1.0.4
django-libsass==0.5
django-oscar==1.5.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment