Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
708f4399
Commit
708f4399
authored
Sep 05, 2017
by
Uman Shahzad
Committed by
Clinton Blackburn
Sep 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ran isort on entire codebase.
parent
65102398
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
89 additions
and
35 deletions
+89
-35
ecommerce/core/migrations/0033_auto_20170606_0539.py
+1
-0
ecommerce/core/tests/test_generate_courses.py
+1
-0
ecommerce/coupons/tests/test_views.py
+2
-1
ecommerce/courses/models.py
+4
-1
ecommerce/courses/tests/test_utils.py
+4
-1
ecommerce/enterprise/tests/test_entitlements.py
+3
-1
ecommerce/extensions/analytics/tests/test_utils.py
+4
-1
ecommerce/extensions/api/v2/tests/views/test_baskets.py
+6
-3
ecommerce/extensions/api/v2/tests/views/test_enterprise.py
+0
-1
ecommerce/extensions/api/v2/tests/views/test_publication.py
+4
-1
ecommerce/extensions/basket/models.py
+0
-1
ecommerce/extensions/basket/views.py
+3
-1
ecommerce/extensions/catalogue/models.py
+3
-1
ecommerce/extensions/catalogue/tests/mixins.py
+3
-1
ecommerce/extensions/fulfillment/tests/test_api.py
+5
-2
ecommerce/extensions/fulfillment/tests/test_modules.py
+11
-4
ecommerce/extensions/offer/models.py
+4
-1
ecommerce/extensions/order/migrations/0014_auto_20170606_0535.py
+1
-0
ecommerce/extensions/payment/management/commands/paypal_profile.py
+1
-1
ecommerce/extensions/payment/processors/cybersource.py
+6
-2
ecommerce/extensions/payment/tests/processors/test_cybersource.py
+6
-2
ecommerce/extensions/voucher/tests/test_utils.py
+5
-3
ecommerce/programs/tests/test_conditions.py
+0
-1
ecommerce/settings/base.py
+0
-1
ecommerce/tests/factories.py
+1
-1
ecommerce/theming/management/commands/tests/test_update_assets.py
+4
-1
ecommerce/theming/tests/test_helpers.py
+7
-2
No files found.
ecommerce/core/migrations/0033_auto_20170606_0539.py
View file @
708f4399
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
from
django.db
import
migrations
from
django.db
import
migrations
from
ecommerce.core.constants
import
USER_LIST_VIEW_SWITCH
from
ecommerce.core.constants
import
USER_LIST_VIEW_SWITCH
...
...
ecommerce/core/tests/test_generate_courses.py
View file @
708f4399
import
json
import
json
import
ddt
import
ddt
import
httpretty
import
httpretty
import
mock
import
mock
...
...
ecommerce/coupons/tests/test_views.py
View file @
708f4399
...
@@ -17,7 +17,8 @@ from ecommerce.coupons.tests.mixins import CouponMixin, DiscoveryMockMixin
...
@@ -17,7 +17,8 @@ from ecommerce.coupons.tests.mixins import CouponMixin, DiscoveryMockMixin
from
ecommerce.coupons.views
import
voucher_is_valid
from
ecommerce.coupons.views
import
voucher_is_valid
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
from
ecommerce.enterprise.utils
import
(
from
ecommerce.enterprise.utils
import
(
get_enterprise_course_consent_url
,
get_enterprise_customer_data_sharing_consent_token
get_enterprise_course_consent_url
,
get_enterprise_customer_data_sharing_consent_token
)
)
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.checkout.mixins
import
EdxOrderPlacementMixin
from
ecommerce.extensions.checkout.mixins
import
EdxOrderPlacementMixin
...
...
ecommerce/courses/models.py
View file @
708f4399
...
@@ -12,7 +12,10 @@ from oscar.core.loading import get_class, get_model
...
@@ -12,7 +12,10 @@ from oscar.core.loading import get_class, get_model
from
simple_history.models
import
HistoricalRecords
from
simple_history.models
import
HistoricalRecords
from
ecommerce.core.constants
import
(
from
ecommerce.core.constants
import
(
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SEAT_TYPES
,
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SEAT_TYPES
,
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
)
)
from
ecommerce.courses.publishers
import
LMSPublisher
from
ecommerce.courses.publishers
import
LMSPublisher
from
ecommerce.extensions.catalogue.utils
import
generate_sku
from
ecommerce.extensions.catalogue.utils
import
generate_sku
...
...
ecommerce/courses/tests/test_utils.py
View file @
708f4399
...
@@ -10,7 +10,10 @@ from ecommerce.core.tests import toggle_switch
...
@@ -10,7 +10,10 @@ from ecommerce.core.tests import toggle_switch
from
ecommerce.coupons.tests.mixins
import
DiscoveryMockMixin
from
ecommerce.coupons.tests.mixins
import
DiscoveryMockMixin
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.utils
import
(
from
ecommerce.courses.utils
import
(
get_certificate_type_display_value
,
get_course_catalogs
,
get_course_info_from_catalog
,
mode_for_seat
get_certificate_type_display_value
,
get_course_catalogs
,
get_course_info_from_catalog
,
mode_for_seat
)
)
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.tests.testcases
import
TestCase
from
ecommerce.tests.testcases
import
TestCase
...
...
ecommerce/enterprise/tests/test_entitlements.py
View file @
708f4399
...
@@ -11,7 +11,9 @@ from ecommerce.core.tests import toggle_switch
...
@@ -11,7 +11,9 @@ from ecommerce.core.tests import toggle_switch
from
ecommerce.coupons.tests.mixins
import
CouponMixin
,
DiscoveryMockMixin
from
ecommerce.coupons.tests.mixins
import
CouponMixin
,
DiscoveryMockMixin
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.enterprise.entitlements
import
(
from
ecommerce.enterprise.entitlements
import
(
get_course_entitlements_for_learner
,
get_course_vouchers_for_learner
,
get_entitlement_voucher
,
get_course_entitlements_for_learner
,
get_course_vouchers_for_learner
,
get_entitlement_voucher
,
is_course_in_enterprise_catalog
is_course_in_enterprise_catalog
)
)
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
...
...
ecommerce/extensions/analytics/tests/test_utils.py
View file @
708f4399
...
@@ -7,7 +7,10 @@ from oscar.test import factories
...
@@ -7,7 +7,10 @@ from oscar.test import factories
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.extensions.analytics.utils
import
(
from
ecommerce.extensions.analytics.utils
import
(
parse_tracking_context
,
prepare_analytics_data
,
track_segment_event
,
translate_basket_line_for_segment
parse_tracking_context
,
prepare_analytics_data
,
track_segment_event
,
translate_basket_line_for_segment
)
)
from
ecommerce.extensions.basket.tests.mixins
import
BasketMixin
from
ecommerce.extensions.basket.tests.mixins
import
BasketMixin
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
...
...
ecommerce/extensions/api/v2/tests/views/test_baskets.py
View file @
708f4399
...
@@ -24,9 +24,12 @@ from ecommerce.extensions.api.v2.tests.views import JSON_CONTENT_TYPE, OrderDeta
...
@@ -24,9 +24,12 @@ from ecommerce.extensions.api.v2.tests.views import JSON_CONTENT_TYPE, OrderDeta
from
ecommerce.extensions.api.v2.views.baskets
import
BasketCreateView
from
ecommerce.extensions.api.v2.views.baskets
import
BasketCreateView
from
ecommerce.extensions.payment
import
exceptions
as
payment_exceptions
from
ecommerce.extensions.payment
import
exceptions
as
payment_exceptions
from
ecommerce.extensions.payment.processors.cybersource
import
Cybersource
from
ecommerce.extensions.payment.processors.cybersource
import
Cybersource
from
ecommerce.extensions.test.factories
import
(
PercentageDiscountBenefitWithoutRangeFactory
,
from
ecommerce.extensions.test.factories
import
(
ProgramCourseRunSeatsConditionFactory
,
PercentageDiscountBenefitWithoutRangeFactory
,
ProgramOfferFactory
,
prepare_voucher
)
ProgramCourseRunSeatsConditionFactory
,
ProgramOfferFactory
,
prepare_voucher
)
from
ecommerce.programs.tests.mixins
import
ProgramTestMixin
from
ecommerce.programs.tests.mixins
import
ProgramTestMixin
from
ecommerce.tests.factories
import
ProductFactory
from
ecommerce.tests.factories
import
ProductFactory
from
ecommerce.tests.mixins
import
BasketCreationMixin
,
ThrottlingMixin
from
ecommerce.tests.mixins
import
BasketCreationMixin
,
ThrottlingMixin
...
...
ecommerce/extensions/api/v2/tests/views/test_enterprise.py
View file @
708f4399
...
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
...
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
import
httpretty
import
httpretty
import
mock
import
mock
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
...
...
ecommerce/extensions/api/v2/tests/views/test_publication.py
View file @
708f4399
...
@@ -10,7 +10,10 @@ from freezegun import freeze_time
...
@@ -10,7 +10,10 @@ from freezegun import freeze_time
from
oscar.core.loading
import
get_model
from
oscar.core.loading
import
get_model
from
ecommerce.core.constants
import
(
from
ecommerce.core.constants
import
(
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SWITCH
,
ISO_8601_FORMAT
,
SEAT_PRODUCT_CLASS_NAME
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SWITCH
,
ISO_8601_FORMAT
,
SEAT_PRODUCT_CLASS_NAME
)
)
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.courses.models
import
Course
from
ecommerce.courses.models
import
Course
...
...
ecommerce/extensions/basket/models.py
View file @
708f4399
...
@@ -5,7 +5,6 @@ from oscar.core.loading import get_class
...
@@ -5,7 +5,6 @@ from oscar.core.loading import get_class
from
ecommerce.extensions.analytics.utils
import
track_segment_event
,
translate_basket_line_for_segment
from
ecommerce.extensions.analytics.utils
import
track_segment_event
,
translate_basket_line_for_segment
OrderNumberGenerator
=
get_class
(
'order.utils'
,
'OrderNumberGenerator'
)
OrderNumberGenerator
=
get_class
(
'order.utils'
,
'OrderNumberGenerator'
)
Selector
=
get_class
(
'partner.strategy'
,
'Selector'
)
Selector
=
get_class
(
'partner.strategy'
,
'Selector'
)
...
...
ecommerce/extensions/basket/views.py
View file @
708f4399
...
@@ -23,7 +23,9 @@ from ecommerce.courses.utils import get_certificate_type_display_value, get_cour
...
@@ -23,7 +23,9 @@ from ecommerce.courses.utils import get_certificate_type_display_value, get_cour
from
ecommerce.enterprise.entitlements
import
get_enterprise_code_redemption_redirect
from
ecommerce.enterprise.entitlements
import
get_enterprise_code_redemption_redirect
from
ecommerce.enterprise.utils
import
CONSENT_FAILED_PARAM
,
get_enterprise_customer_from_voucher
from
ecommerce.enterprise.utils
import
CONSENT_FAILED_PARAM
,
get_enterprise_customer_from_voucher
from
ecommerce.extensions.analytics.utils
import
(
from
ecommerce.extensions.analytics.utils
import
(
prepare_analytics_data
,
track_segment_event
,
translate_basket_line_for_segment
prepare_analytics_data
,
track_segment_event
,
translate_basket_line_for_segment
)
)
from
ecommerce.extensions.basket.utils
import
add_utm_params_to_url
,
get_basket_switch_data
,
prepare_basket
from
ecommerce.extensions.basket.utils
import
add_utm_params_to_url
,
get_basket_switch_data
,
prepare_basket
from
ecommerce.extensions.offer.utils
import
format_benefit_value
,
render_email_confirmation_if_required
from
ecommerce.extensions.offer.utils
import
format_benefit_value
,
render_email_confirmation_if_required
...
...
ecommerce/extensions/catalogue/models.py
View file @
708f4399
...
@@ -6,7 +6,9 @@ from oscar.apps.catalogue.abstract_models import AbstractProduct, AbstractProduc
...
@@ -6,7 +6,9 @@ from oscar.apps.catalogue.abstract_models import AbstractProduct, AbstractProduc
from
simple_history.models
import
HistoricalRecords
from
simple_history.models
import
HistoricalRecords
from
ecommerce.core.constants
import
(
from
ecommerce.core.constants
import
(
COUPON_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
SEAT_PRODUCT_CLASS_NAME
COUPON_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
SEAT_PRODUCT_CLASS_NAME
)
)
from
ecommerce.core.utils
import
log_message_and_raise_validation_error
from
ecommerce.core.utils
import
log_message_and_raise_validation_error
...
...
ecommerce/extensions/catalogue/tests/mixins.py
View file @
708f4399
...
@@ -7,7 +7,9 @@ from oscar.core.utils import slugify
...
@@ -7,7 +7,9 @@ from oscar.core.utils import slugify
from
oscar.test
import
factories
from
oscar.test
import
factories
from
ecommerce.core.constants
import
(
from
ecommerce.core.constants
import
(
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
)
)
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
...
...
ecommerce/extensions/fulfillment/tests/test_api.py
View file @
708f4399
...
@@ -6,8 +6,11 @@ from nose.tools import raises
...
@@ -6,8 +6,11 @@ from nose.tools import raises
from
testfixtures
import
LogCapture
from
testfixtures
import
LogCapture
from
ecommerce.extensions.fulfillment
import
api
,
exceptions
from
ecommerce.extensions.fulfillment
import
api
,
exceptions
from
ecommerce.extensions.fulfillment.api
import
(
get_fulfillment_modules
,
get_fulfillment_modules_for_line
,
from
ecommerce.extensions.fulfillment.api
import
(
revoke_fulfillment_for_refund
)
get_fulfillment_modules
,
get_fulfillment_modules_for_line
,
revoke_fulfillment_for_refund
)
from
ecommerce.extensions.fulfillment.status
import
LINE
,
ORDER
from
ecommerce.extensions.fulfillment.status
import
LINE
,
ORDER
from
ecommerce.extensions.fulfillment.tests.mixins
import
FulfillmentTestMixin
from
ecommerce.extensions.fulfillment.tests.mixins
import
FulfillmentTestMixin
from
ecommerce.extensions.fulfillment.tests.modules
import
FakeFulfillmentModule
from
ecommerce.extensions.fulfillment.tests.modules
import
FakeFulfillmentModule
...
...
ecommerce/extensions/fulfillment/tests/test_modules.py
View file @
708f4399
...
@@ -13,16 +13,23 @@ from oscar.test.newfactories import BasketFactory, UserFactory
...
@@ -13,16 +13,23 @@ from oscar.test.newfactories import BasketFactory, UserFactory
from
requests.exceptions
import
ConnectionError
,
Timeout
from
requests.exceptions
import
ConnectionError
,
Timeout
from
testfixtures
import
LogCapture
from
testfixtures
import
LogCapture
from
ecommerce.core.constants
import
(
COUPON_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
from
ecommerce.core.constants
import
(
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
)
COUPON_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_PRODUCT_CLASS_NAME
,
ENROLLMENT_CODE_SWITCH
,
SEAT_PRODUCT_CLASS_NAME
)
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.core.tests
import
toggle_switch
from
ecommerce.core.url_utils
import
get_lms_enrollment_api_url
from
ecommerce.core.url_utils
import
get_lms_enrollment_api_url
from
ecommerce.coupons.tests.mixins
import
CouponMixin
from
ecommerce.coupons.tests.mixins
import
CouponMixin
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.utils
import
mode_for_seat
from
ecommerce.courses.utils
import
mode_for_seat
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.catalogue.tests.mixins
import
DiscoveryTestMixin
from
ecommerce.extensions.fulfillment.modules
import
(
CouponFulfillmentModule
,
EnrollmentCodeFulfillmentModule
,
from
ecommerce.extensions.fulfillment.modules
import
(
EnrollmentFulfillmentModule
)
CouponFulfillmentModule
,
EnrollmentCodeFulfillmentModule
,
EnrollmentFulfillmentModule
)
from
ecommerce.extensions.fulfillment.status
import
LINE
from
ecommerce.extensions.fulfillment.status
import
LINE
from
ecommerce.extensions.fulfillment.tests.mixins
import
FulfillmentTestMixin
from
ecommerce.extensions.fulfillment.tests.mixins
import
FulfillmentTestMixin
from
ecommerce.extensions.test.factories
import
create_order
from
ecommerce.extensions.test.factories
import
create_order
...
...
ecommerce/extensions/offer/models.py
View file @
708f4399
...
@@ -7,7 +7,10 @@ from django.core.cache import cache
...
@@ -7,7 +7,10 @@ from django.core.cache import cache
from
django.db
import
models
from
django.db
import
models
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
oscar.apps.offer.abstract_models
import
(
from
oscar.apps.offer.abstract_models
import
(
AbstractBenefit
,
AbstractCondition
,
AbstractConditionalOffer
,
AbstractRange
AbstractBenefit
,
AbstractCondition
,
AbstractConditionalOffer
,
AbstractRange
)
)
from
requests.exceptions
import
ConnectionError
,
Timeout
from
requests.exceptions
import
ConnectionError
,
Timeout
from
slumber.exceptions
import
SlumberBaseException
from
slumber.exceptions
import
SlumberBaseException
...
...
ecommerce/extensions/order/migrations/0014_auto_20170606_0535.py
View file @
708f4399
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
from
django.db
import
migrations
from
django.db
import
migrations
from
ecommerce.extensions.order.constants
import
ORDER_LIST_VIEW_SWITCH
from
ecommerce.extensions.order.constants
import
ORDER_LIST_VIEW_SWITCH
...
...
ecommerce/extensions/payment/management/commands/paypal_profile.py
View file @
708f4399
...
@@ -5,7 +5,7 @@ import paypalrestsdk
...
@@ -5,7 +5,7 @@ import paypalrestsdk
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.management.base
import
BaseCommand
,
CommandError
from
django.core.management.base
import
BaseCommand
,
CommandError
from
django.db.utils
import
IntegrityError
from
django.db.utils
import
IntegrityError
from
paypalrestsdk
import
WebProfile
# pylint: disable=ungrouped-imports
from
paypalrestsdk
import
WebProfile
# pylint: disable=ungrouped-imports
from
ecommerce.extensions.payment.models
import
PaypalWebProfile
from
ecommerce.extensions.payment.models
import
PaypalWebProfile
...
...
ecommerce/extensions/payment/processors/cybersource.py
View file @
708f4399
...
@@ -21,8 +21,12 @@ from ecommerce.core.url_utils import get_ecommerce_url
...
@@ -21,8 +21,12 @@ from ecommerce.core.url_utils import get_ecommerce_url
from
ecommerce.extensions.checkout.utils
import
get_receipt_page_url
from
ecommerce.extensions.checkout.utils
import
get_receipt_page_url
from
ecommerce.extensions.payment.constants
import
APPLE_PAY_CYBERSOURCE_CARD_TYPE_MAP
,
CYBERSOURCE_CARD_TYPE_MAP
from
ecommerce.extensions.payment.constants
import
APPLE_PAY_CYBERSOURCE_CARD_TYPE_MAP
,
CYBERSOURCE_CARD_TYPE_MAP
from
ecommerce.extensions.payment.exceptions
import
(
from
ecommerce.extensions.payment.exceptions
import
(
DuplicateReferenceNumber
,
InvalidCybersourceDecision
,
InvalidSignatureError
,
PartialAuthorizationError
,
DuplicateReferenceNumber
,
PCIViolation
,
ProcessorMisconfiguredError
InvalidCybersourceDecision
,
InvalidSignatureError
,
PartialAuthorizationError
,
PCIViolation
,
ProcessorMisconfiguredError
)
)
from
ecommerce.extensions.payment.helpers
import
sign
from
ecommerce.extensions.payment.helpers
import
sign
from
ecommerce.extensions.payment.processors
import
BaseClientSidePaymentProcessor
,
HandledProcessorResponse
from
ecommerce.extensions.payment.processors
import
BaseClientSidePaymentProcessor
,
HandledProcessorResponse
...
...
ecommerce/extensions/payment/tests/processors/test_cybersource.py
View file @
708f4399
...
@@ -17,8 +17,12 @@ from oscar.test import factories
...
@@ -17,8 +17,12 @@ from oscar.test import factories
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.courses.tests.factories
import
CourseFactory
from
ecommerce.extensions.payment.exceptions
import
(
from
ecommerce.extensions.payment.exceptions
import
(
DuplicateReferenceNumber
,
InvalidCybersourceDecision
,
InvalidSignatureError
,
DuplicateReferenceNumber
,
PartialAuthorizationError
,
PCIViolation
,
ProcessorMisconfiguredError
InvalidCybersourceDecision
,
InvalidSignatureError
,
PartialAuthorizationError
,
PCIViolation
,
ProcessorMisconfiguredError
)
)
from
ecommerce.extensions.payment.models
import
PaymentProcessorResponse
from
ecommerce.extensions.payment.models
import
PaymentProcessorResponse
from
ecommerce.extensions.payment.processors.cybersource
import
Cybersource
from
ecommerce.extensions.payment.processors.cybersource
import
Cybersource
...
...
ecommerce/extensions/voucher/tests/test_utils.py
View file @
708f4399
...
@@ -22,13 +22,15 @@ from ecommerce.extensions.fulfillment.modules import CouponFulfillmentModule
...
@@ -22,13 +22,15 @@ from ecommerce.extensions.fulfillment.modules import CouponFulfillmentModule
from
ecommerce.extensions.fulfillment.status
import
LINE
from
ecommerce.extensions.fulfillment.status
import
LINE
from
ecommerce.extensions.test.factories
import
create_order
,
prepare_voucher
from
ecommerce.extensions.test.factories
import
create_order
,
prepare_voucher
from
ecommerce.extensions.voucher.utils
import
(
from
ecommerce.extensions.voucher.utils
import
(
create_vouchers
,
generate_coupon_report
,
get_voucher_and_products_from_code
,
create_vouchers
,
get_voucher_discount_info
,
update_voucher_offer
generate_coupon_report
,
get_voucher_and_products_from_code
,
get_voucher_discount_info
,
update_voucher_offer
)
)
from
ecommerce.tests.mixins
import
LmsApiMockMixin
from
ecommerce.tests.mixins
import
LmsApiMockMixin
from
ecommerce.tests.testcases
import
TestCase
from
ecommerce.tests.testcases
import
TestCase
Basket
=
get_model
(
'basket'
,
'Basket'
)
Basket
=
get_model
(
'basket'
,
'Basket'
)
Benefit
=
get_model
(
'offer'
,
'Benefit'
)
Benefit
=
get_model
(
'offer'
,
'Benefit'
)
Catalog
=
get_model
(
'catalogue'
,
'Catalog'
)
Catalog
=
get_model
(
'catalogue'
,
'Catalog'
)
...
...
ecommerce/programs/tests/test_conditions.py
View file @
708f4399
...
@@ -2,7 +2,6 @@ import ddt
...
@@ -2,7 +2,6 @@ import ddt
import
httpretty
import
httpretty
import
mock
import
mock
from
oscar.core.loading
import
get_model
from
oscar.core.loading
import
get_model
from
requests
import
Timeout
from
requests
import
Timeout
from
slumber.exceptions
import
HttpNotFoundError
,
SlumberBaseException
from
slumber.exceptions
import
HttpNotFoundError
,
SlumberBaseException
...
...
ecommerce/settings/base.py
View file @
708f4399
...
@@ -7,7 +7,6 @@ from os.path import abspath, basename, dirname, join, normpath
...
@@ -7,7 +7,6 @@ from os.path import abspath, basename, dirname, join, normpath
from
sys
import
path
from
sys
import
path
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
oscar
import
OSCAR_MAIN_TEMPLATE_DIR
from
oscar
import
OSCAR_MAIN_TEMPLATE_DIR
from
ecommerce.settings._oscar
import
*
from
ecommerce.settings._oscar
import
*
...
...
ecommerce/tests/factories.py
View file @
708f4399
import
factory
import
factory
from
django.contrib.sites.models
import
Site
from
django.contrib.sites.models
import
Site
from
factory.fuzzy
import
FuzzyText
# pylint: disable=ungrouped-imports
from
factory.fuzzy
import
FuzzyText
# pylint: disable=ungrouped-imports
from
faker
import
Faker
from
faker
import
Faker
from
oscar.core.loading
import
get_model
from
oscar.core.loading
import
get_model
from
oscar.test.factories
import
StockRecordFactory
as
OscarStockRecordFactory
from
oscar.test.factories
import
StockRecordFactory
as
OscarStockRecordFactory
...
...
ecommerce/theming/management/commands/tests/test_update_assets.py
View file @
708f4399
...
@@ -9,7 +9,10 @@ from path import Path
...
@@ -9,7 +9,10 @@ from path import Path
from
ecommerce.theming.helpers
import
get_themes
from
ecommerce.theming.helpers
import
get_themes
from
ecommerce.theming.management.commands.update_assets
import
(
from
ecommerce.theming.management.commands.update_assets
import
(
SYSTEM_SASS_PATHS
,
Command
,
compile_sass
,
get_sass_directories
SYSTEM_SASS_PATHS
,
Command
,
compile_sass
,
get_sass_directories
)
)
...
...
ecommerce/theming/tests/test_helpers.py
View file @
708f4399
...
@@ -7,8 +7,13 @@ from mock import patch
...
@@ -7,8 +7,13 @@ from mock import patch
from
ecommerce.tests.testcases
import
TestCase
from
ecommerce.tests.testcases
import
TestCase
from
ecommerce.theming.helpers
import
(
from
ecommerce.theming.helpers
import
(
Theme
,
get_all_theme_template_dirs
,
get_current_site_theme
,
get_current_theme
,
get_theme_base_dir
,
Theme
,
get_theme_base_dirs
,
get_themes
get_all_theme_template_dirs
,
get_current_site_theme
,
get_current_theme
,
get_theme_base_dir
,
get_theme_base_dirs
,
get_themes
)
)
from
ecommerce.theming.test_utils
import
with_comprehensive_theme
from
ecommerce.theming.test_utils
import
with_comprehensive_theme
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment