Merge branch 'master' into search

Had to add "apps" to many of the import paths within the search module

Conflicts:
	examples/vanilla/settings.py
	oscar/apps/promotions/views.py
	oscar/tests.py
	oscar/urls.py
	requirements-dev.txt

docs/source/contributing.rst

@@ -3,9 +3,6 @@ Contributing
 
 Make sure you've read http://python.net/~goodger/projects/pycon/2007/idiomatic/handout.html
 
-Guidelines
-----------
-
 * New features should be discussed on the mailing list (or in the meetings) before serious work starts
 * Pull requests will be rejected if sufficient tests aren't provided
 * Please updated the documentation when altering behaviour or introducing new features 

docs/source/index.rst

@@ -3,8 +3,9 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-django-oscar - Domain-driven e-commerce for Django
-==================================================
+=============================================
+Welcome to the documentation for django-oscar
+=============================================
 
 django-oscar is a flexible e-commerce platform for Django, designed to build domain-driven
 ecommerce sites.  It differs from other e-commerce projects in that the core of django-oscar is kept
@@ -19,11 +20,17 @@ their existing Taoshop PHP platform which currently powers several large-scale e
 It is still in early development, but a stable release is planned for early summer 2011.
 The source is on Github: https://github.com/tangentlabs/django-oscar
 
+Getting started:
 
+.. toctree::
+    :maxdepth: 2
+    :numbered:
 
+    contributing
+    getting_started
 
 
-Contents:
+Full contents:
 
 .. toctree::
    :maxdepth: 2

examples/vanilla/import.py

@@ -5,8 +5,8 @@ from django.core.management import setup_environ
 import settings as app_settings
 setup_environ(app_settings)
 
-from oscar.product.models import ItemClass, Item, AttributeType, ItemAttributeValue, Option
-from oscar.stock.models import Partner, StockRecord
+from oscar.apps.product.models import ItemClass, Item, AttributeType, ItemAttributeValue, Option
+from oscar.apps.stock.models import Partner, StockRecord
 from django.db import connection as django_connection
 
 connection = MySQLdb.connect(host='localhost', user='root', passwd='gsiwmm', db='CWDM_app_production_copy')

examples/vanilla/settings.py

@@ -81,8 +81,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.static",
     "django.contrib.messages.context_processors.messages",
     # Oscar specific
-    'oscar.promotions.context_processors.promotions',
-    'oscar.search.context_processors.search_form',
+    'oscar.apps.search.context_processors.search_form',
+    'oscar.apps.promotions.context_processors.promotions',
 ) 
 
 MIDDLEWARE_CLASSES = (
@@ -182,23 +182,23 @@ INSTALLED_APPS = (
     #'debug_toolbar',
     # Apps from oscar
     'oscar',
-    'oscar.analytics',
-    'oscar.discount',
-    'oscar.order',
-    'oscar.checkout',
-    'oscar.shipping',
-    'oscar.order_management',
-    'oscar.product',
-    'oscar.basket',
-    'oscar.payment',
-    'oscar.offer',
-    'oscar.address',
-    'oscar.stock',
-    'oscar.image',
-    'oscar.customer',
-    'oscar.promotions',
-    'oscar.reports',
-    'oscar.search',
+    'oscar.apps.analytics',
+    'oscar.apps.discount',
+    'oscar.apps.order',
+    'oscar.apps.checkout',
+    'oscar.apps.shipping',
+    'oscar.apps.order_management',
+    'oscar.apps.product',
+    'oscar.apps.basket',
+    'oscar.apps.payment',
+    'oscar.apps.offer',
+    'oscar.apps.address',
+    'oscar.apps.stock',
+    'oscar.apps.image',
+    'oscar.apps.customer',
+    'oscar.apps.promotions',
+    'oscar.apps.reports',
+    'oscar.apps.search',
 )
 
 LOGIN_REDIRECT_URL = '/shop/accounts/profile/'

oscar/address/admin.py → oscar/apps/address/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('address.models', ['UserAddress', 'Country'])
 
 admin.site.register(models.UserAddress)

oscar/address/forms.py → oscar/apps/address/forms.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.forms import ModelForm
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 address_models = import_module('address.models', ['UserAddress'])
 
 

oscar/address/models.py → oscar/apps/address/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from oscar.address.abstract_models import AbstractUserAddress, AbstractCountry
+from oscar.apps.address.abstract_models import AbstractUserAddress, AbstractCountry
 
 
 class UserAddress(AbstractUserAddress):

oscar/address/tests.py → oscar/apps/address/tests.py

@@ -1,9 +1,9 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
 
-from oscar.address.models import Country, UserAddress
-from oscar.basket.models import Basket
-from oscar.order.models import ShippingAddress
+from oscar.apps.address.models import Country, UserAddress
+from oscar.apps.basket.models import Basket
+from oscar.apps.order.models import ShippingAddress
 
 
 class UserAddressTest(TestCase):

oscar/analytics/admin.py → oscar/apps/analytics/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('analytics.models', ['ProductRecord', 'UserRecord', 'UserSearch', 
                                             'UserProductView'])
 

oscar/analytics/models.py → oscar/apps/analytics/models.py

@@ -1,8 +1,8 @@
 from django.dispatch import receiver
 
-from oscar.analytics.abstract_models import (AbstractProductRecord, AbstractUserRecord,
+from oscar.apps.analytics.abstract_models import (AbstractProductRecord, AbstractUserRecord,
                                              AbstractUserProductView, AbstractUserSearch)
-from oscar.services import import_module
+from oscar.core.loading import import_module
 
 product_signals = import_module('product.signals', ['product_viewed', 'product_search'])
 basket_signals = import_module('basket.signals', ['basket_addition'])

oscar/analytics/reports.py → oscar/apps/analytics/reports.py

@@ -1,6 +1,6 @@
 import csv
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 report_classes = import_module('reports.reports', ['ReportGenerator'])
 analytics_models = import_module('analytics.models', ['ProductRecord', 'UserRecord'])
 

oscar/basket/abstract_models.py → oscar/apps/basket/abstract_models.py

@@ -7,7 +7,7 @@ from django.db import models
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
 
-from oscar.basket.managers import OpenBasketManager, SavedBasketManager
+from oscar.apps.basket.managers import OpenBasketManager, SavedBasketManager
 
 # Basket statuses
 OPEN, MERGED, SAVED, SUBMITTED = ("Open", "Merged", "Saved", "Submitted")

oscar/basket/admin.py → oscar/apps/basket/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('basket.models', ['Basket', 'Line', 'LineAttribute'])
 
 

oscar/basket/factory.py → oscar/apps/basket/factory.py

@@ -2,7 +2,7 @@ import zlib
 
 from django.conf import settings
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 basket_models = import_module('basket.models', ['Basket', 'Line'])
 offer_utils = import_module('offer.utils', ['Applicator'])
 

oscar/basket/models.py → oscar/apps/basket/models.py

@@ -3,7 +3,7 @@ from exceptions import Exception
 from django.core.signals import request_finished
 from django.dispatch import receiver
 
-from oscar.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
+from oscar.apps.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
                                           OPEN, MERGED, SAVED, SUBMITTED)
 
 

oscar/basket/reports.py → oscar/apps/basket/reports.py

@@ -1,6 +1,6 @@
 import csv
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 report_classes = import_module('reports.reports', ['ReportGenerator'])
 basket_models = import_module('basket.models', ['Basket', 'OPEN', 'SUBMITTED'])
 

oscar/basket/tests.py → oscar/apps/basket/tests.py

@@ -2,8 +2,8 @@ from django.utils import unittest
 from django.test.client import Client
 from django.core.urlresolvers import reverse
 
-from oscar.basket.models import * 
-from oscar.product.models import Item, ItemClass
+from oscar.apps.basket.models import * 
+from oscar.apps.product.models import Item, ItemClass
 
 
 class BasketModelTest(unittest.TestCase):

oscar/basket/urls.py → oscar/apps/basket/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from oscar.basket.views import BasketView, LineView, SavedLineView
+from oscar.apps.basket.views import BasketView, LineView, SavedLineView
 
 def line_view(request, *args, **kwargs):
     return LineView()(request, *args, **kwargs)

oscar/basket/views.py → oscar/apps/basket/views.py

@@ -5,8 +5,8 @@ from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 
-from oscar.views import ModelView
-from oscar.services import import_module
+from oscar.view.generic import ModelView
+from oscar.core.loading import import_module
 
 basket_models = import_module('basket.models', ['Basket', 'Line', 'InvalidBasketLineError'])
 basket_forms = import_module('basket.forms', ['FormFactory'])

oscar/checkout/core_views.py → oscar/apps/checkout/core_views.py

@@ -2,7 +2,7 @@ from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpRespons
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 basket_factory = import_module('basket.factory', ['BasketFactory'])
 checkout_calculators = import_module('checkout.calculators', ['OrderTotalCalculator'])
 order_models = import_module('order.models', ['Order', 'ShippingAddress'])

oscar/checkout/forms.py → oscar/apps/checkout/forms.py

@@ -1,6 +1,6 @@
 from django.forms import ModelForm
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 
 address_models = import_module('address.models', ['Country'])
 order_models = import_module('order.models', ['ShippingAddress'])

oscar/checkout/tests.py → oscar/apps/checkout/tests.py

@@ -2,7 +2,7 @@ from django.utils import unittest
 from django.test.client import Client
 from django.core.urlresolvers import reverse
 
-from oscar.checkout.utils import ProgressChecker
+from oscar.apps.checkout.utils import ProgressChecker
         
 class CheckoutViewsTest(unittest.TestCase):
     

oscar/checkout/urls.py → oscar/apps/checkout/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import *
 
-from oscar.views import class_based_view
-from oscar.services import import_module
+from oscar.core.decorators import class_based_view
+from oscar.core.loading import import_module
 
 checkout_views = import_module('checkout.views', ['IndexView', 'ShippingAddressView',
                                                   'ShippingMethodView', 'PaymentMethodView', 'OrderPreviewView',

oscar/checkout/utils.py → oscar/apps/checkout/utils.py

@@ -1,6 +1,6 @@
 from django.core.urlresolvers import resolve
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 
 shipping_methods = import_module('shipping.repository', ['Repository'])
 

oscar/checkout/views.py → oscar/apps/checkout/views.py

@@ -12,8 +12,8 @@ from django.core.urlresolvers import resolve
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import ugettext as _
 
-from oscar.views import ModelView
-from oscar.services import import_module
+from oscar.view.generic import ModelView
+from oscar.core.loading import import_module
 
 basket_factory = import_module('basket.factory', ['BasketFactory'])
 checkout_forms = import_module('checkout.forms', ['ShippingAddressForm'])

oscar/customer/history_helpers.py → oscar/apps/customer/history_helpers.py

@@ -3,7 +3,7 @@ import json
 from django.dispatch import receiver
 from django.conf import settings
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 product_signals = import_module('product.signals', ['product_viewed'])
 
 MAX_PRODUCTS = getattr(settings, 'OSCAR_RECENTLY_VIEWED_PRODUCTS', 5)

oscar/customer/templatetags/history_tags.py → oscar/apps/customer/templatetags/history_tags.py

@@ -1,6 +1,6 @@
 from django import template
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 product_models = import_module('product.models', ['Item', 'ItemClass'])
 history_helpers = import_module('customer.history_helpers', ['get_recently_viewed_product_ids'])
 

oscar/customer/tests.py → oscar/apps/customer/tests.py

@@ -3,8 +3,8 @@ from django.test.client import Client
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 
-from oscar.customer.history_helpers import get_recently_viewed_product_ids
-from oscar.test_helpers import create_product
+from oscar.apps.customer.history_helpers import get_recently_viewed_product_ids
+from oscar.test.helpers import create_product
 
 class HistoryHelpersTest(unittest.TestCase):
     

oscar/customer/urls.py → oscar/apps/customer/urls.py

@@ -1,15 +1,15 @@
 from django.conf.urls.defaults import *
 from django.contrib.auth.decorators import login_required
 
-from oscar.views import class_based_view
-from oscar.customer.views import OrderHistoryView, OrderDetailView, OrderLineView, AddressBookView, AddressView
+from oscar.core.decorators import class_based_view
+from oscar.apps.customer.views import OrderHistoryView, OrderDetailView, OrderLineView, AddressBookView, AddressView
 
 urlpatterns = patterns('django.contrib.auth.views',
     url(r'^login/$', 'login', {'template_name': 'admin/login.html'}, name='oscar-customer-login'),
     url(r'^logout/$', 'login', name='oscar-customer-logout'),
 )
 
-urlpatterns = patterns('oscar.customer.views',
+urlpatterns = patterns('oscar.apps.customer.views',
     url(r'^profile/$', 'profile', name='oscar-customer-profile'),
     url(r'^order-history/$', OrderHistoryView.as_view(), name='oscar-customer-order-history'),
     url(r'^order/(?P<order_number>[\w-]*)/$', login_required(class_based_view(OrderDetailView)), name='oscar-customer-order-view'),

oscar/customer/views.py → oscar/apps/customer/views.py

@@ -5,9 +5,9 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.contrib import messages
 
-from oscar.address.forms import UserAddressForm
-from oscar.views import ModelView
-from oscar.services import import_module
+from oscar.apps.address.forms import UserAddressForm
+from oscar.view.generic import ModelView
+from oscar.core.loading import import_module
 address_models = import_module('address.models', ['UserAddress'])
 order_models = import_module('order.models', ['Order', 'Line'])
 basket_models = import_module('basket.models', ['Basket'])

oscar/datacash/models.py → oscar/apps/datacash/models.py

@@ -1,7 +1,7 @@
 u"""Vanilla implementation of Datacash models"""
 from django.db import models
 
-from oscar.datacash.abstract_models import Transaction
+from oscar.apps.datacash.abstract_models import Transaction
 
 class Transaction(AbstractTransaction):
     pass

oscar/discount/admin.py → oscar/apps/discount/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('discount.models', ['DiscountOffer'])
 
 class DiscountOfferAdmin(admin.ModelAdmin):

oscar/discount/models.py → oscar/apps/discount/models.py

@@ -1,4 +1,4 @@
-from oscar.discount.abstract_models import (AbstractDiscountOffer, PERCENTAGE_DISCOUNT, 
+from oscar.apps.discount.abstract_models import (AbstractDiscountOffer, PERCENTAGE_DISCOUNT, 
                                             ABSOLUTE_DISCOUNT, FINAL_PRICE)
 
 class DiscountOffer(AbstractDiscountOffer):

oscar/discount/tests.py → oscar/apps/discount/tests.py

@@ -3,8 +3,8 @@ import datetime
 
 from django.utils import unittest
 
-from oscar.test_helpers import create_product
-from oscar.discount.models import DiscountOffer, PERCENTAGE_DISCOUNT, ABSOLUTE_DISCOUNT, FINAL_PRICE 
+from oscar.test.helpers import create_product
+from oscar.apps.discount.models import DiscountOffer, PERCENTAGE_DISCOUNT, ABSOLUTE_DISCOUNT, FINAL_PRICE 
 
 
 class PercentageDiscountOfferTest(unittest.TestCase):

oscar/image/admin.py → oscar/apps/image/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
-from oscar.image.models import *
+
+from oscar.apps.image.models import *
 
 admin.site.register(Image)

oscar/apps/image/models.py

@@ -0,0 +1,5 @@
+from oscar.apps.image.abstract_models import AbstractImage
+
+class Image(AbstractImage):
+    pass
+

oscar/offer/abstract_models.py → oscar/apps/offer/abstract_models.py

@@ -6,7 +6,7 @@ from django.db import models
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ValidationError
 
-from oscar.offer.managers import ActiveOfferManager
+from oscar.apps.offer.managers import ActiveOfferManager
 
 SITE, VOUCHER, USER, SESSION = ("Site", "Voucher", "User", "Session")
 

oscar/offer/admin.py → oscar/apps/offer/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('offer.models', ['ConditionalOffer', 'Condition', 'Benefit', 'Range',
                                         'Voucher', 'VoucherApplication'])
 

oscar/offer/models.py → oscar/apps/offer/models.py

@@ -7,7 +7,7 @@ from django.db import models
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ValidationError
 
-from oscar.offer.managers import ActiveOfferManager
+from oscar.apps.offer.managers import ActiveOfferManager
 
 SITE, VOUCHER, USER, SESSION = ("Site", "Voucher", "User", "Session")
 
@@ -570,4 +570,4 @@ class MultibuyDiscountBenefit(Benefit):
         return cheapest_line
 
 # We need to import receivers at the bottom of this script
-from oscar.offer.receivers import receive_basket_voucher_change
+from oscar.apps.offer.receivers import receive_basket_voucher_change

oscar/offer/receivers.py → oscar/apps/offer/receivers.py

@@ -1,7 +1,7 @@
 from django.dispatch import receiver
 from django.db.models.signals import m2m_changed, post_save
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 offer_models = import_module('offer.models', ['Voucher'])
 order_models = import_module('order.models', ['OrderDiscount'])
 

oscar/offer/reports.py → oscar/apps/offer/reports.py

@@ -1,6 +1,6 @@
 import csv
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 report_classes = import_module('reports.reports', ['ReportGenerator'])
 offer_models = import_module('offer.models', ['Voucher', 'ConditionalOffer'])
 

oscar/offer/tests.py → oscar/apps/offer/tests.py

@@ -4,11 +4,11 @@ import datetime
 from django.utils import unittest
 from django.test.client import Client
 
-from oscar.offer.models import * 
-from oscar.basket.models import Basket
-from oscar.product.models import Item, ItemClass
-from oscar.stock.models import Partner, StockRecord
-from oscar.test_helpers import create_product
+from oscar.apps.offer.models import * 
+from oscar.apps.basket.models import Basket
+from oscar.apps.product.models import Item, ItemClass
+from oscar.apps.stock.models import Partner, StockRecord
+from oscar.test.helpers import create_product
 
 
 class RangeTest(unittest.TestCase):

oscar/offer/utils.py → oscar/apps/offer/utils.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 from itertools import chain
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 offer_models = import_module('offer.models', ['ConditionalOffer'])
 
 

oscar/order/admin.py → oscar/apps/order/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('order.models', ['Order', 'OrderNote', 'CommunicationEvent', 'CommunicationEventType',
                                         'BillingAddress', 'ShippingAddress', 'Line',
                                         'LinePrice', 'ShippingEvent', 'ShippingEventType', 

oscar/order/models.py → oscar/apps/order/models.py

@@ -1,8 +1,8 @@
 u"""Vanilla implementation of order models"""
 from django.db import models
 
-from oscar.order.abstract_models import *
-from oscar.address.abstract_models import AbstractShippingAddress, AbstractBillingAddress
+from oscar.apps.order.abstract_models import *
+from oscar.apps.address.abstract_models import AbstractShippingAddress, AbstractBillingAddress
 
 class Order(AbstractOrder):
     pass

oscar/order/reports.py → oscar/apps/order/reports.py

@@ -1,6 +1,6 @@
 import csv
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 report_classes = import_module('reports.reports', ['ReportGenerator'])
 order_models = import_module('order.models', ['Order'])
 

oscar/order/tests.py → oscar/apps/order/tests.py

@@ -2,9 +2,9 @@ from decimal import Decimal
 
 from django.test import TestCase
 
-from oscar.address.models import Country
-from oscar.basket.models import Basket
-from oscar.order.models import ShippingAddress, Order, Line, ShippingEvent, ShippingEventType, ShippingEventQuantity
+from oscar.apps.address.models import Country
+from oscar.apps.basket.models import Basket
+from oscar.apps.order.models import ShippingAddress, Order, Line, ShippingEvent, ShippingEventType, ShippingEventQuantity
 
 ORDER_PLACED = 'order_placed'
 

oscar/order/utils.py → oscar/apps/order/utils.py

@@ -1,6 +1,6 @@
 from django.contrib.sites.models import Site
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 order_models = import_module('order.models', ['ShippingAddress', 'Order', 'Line', 
                                               'LinePrice', 'LineAttribute', 'OrderDiscount'])
 order_signals = import_module('order.signals', ['order_placed'])

oscar/order_management/urls.py → oscar/apps/order_management/urls.py

@@ -1,8 +1,8 @@
 from django.conf.urls.defaults import *
 from django.contrib.admin.views.decorators import staff_member_required
 
-from oscar.views import class_based_view
-from oscar.order_management.views import OrderListView, OrderView
+from oscar.core.decorators import class_based_view
+from oscar.apps.order_management.views import OrderListView, OrderView
 
 urlpatterns = patterns('oscar.order_management.views',
     url(r'^$', staff_member_required(OrderListView.as_view()), name='oscar-order-management-list'),

oscar/order_management/views.py → oscar/apps/order_management/views.py

@@ -7,8 +7,8 @@ from django.views.generic import ListView, DetailView
 from django.contrib import messages
 from django.db import transaction
 
-from oscar.views import ModelView
-from oscar.services import import_module
+from oscar.view.generic import ModelView
+from oscar.core.loading import import_module
 order_models = import_module('order.models', ['Order', 'Line', 'ShippingEvent', 'ShippingEventQuantity', 
                                               'ShippingEventType', 'PaymentEvent', 'PaymentEventType', 'OrderNote'])
 

oscar/payment/admin.py → oscar/apps/payment/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 models = import_module('payment.models', ['Source', 'Transaction', 'SourceType'])
 
 class SourceAdmin(admin.ModelAdmin):

oscar/payment/forms.py → oscar/apps/payment/forms.py

@@ -4,7 +4,7 @@ import re
 
 from django import forms
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 
 address_models = import_module('address.models', ['Country'])
 order_models = import_module('order.models', ['BillingAddress'])

oscar/payment/models.py → oscar/apps/payment/models.py

@@ -1,4 +1,4 @@
-from oscar.payment.abstract_models import *
+from oscar.apps.payment.abstract_models import *
 
 class Source(AbstractSource):
     pass

oscar/payment/tests.py → oscar/apps/payment/tests.py

@@ -3,8 +3,8 @@ import datetime
 from django.test import TestCase
 from django.contrib.auth.models import User
 
-from oscar.payment.models import Bankcard
-from oscar.payment.forms import bankcard_type, VISA, MASTERCARD, AMEX, DISCOVER, BankcardNumberField, luhn
+from oscar.apps.payment.models import Bankcard
+from oscar.apps.payment.forms import bankcard_type, VISA, MASTERCARD, AMEX, DISCOVER, BankcardNumberField, luhn
 
 
 class BankcardTest(TestCase):

oscar/product/abstract_models.py → oscar/apps/product/abstract_models.py

@@ -10,7 +10,7 @@ from django.template.defaultfilters import slugify
 from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
 
-from oscar.product.managers import BrowsableItemManager
+from oscar.apps.product.managers import BrowsableItemManager
 
 def _convert_to_underscores(str):
     u"""

oscar/product/admin.py → oscar/apps/product/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.services import import_module
+from oscar.core.loading import import_module
 product_models = import_module('product.models', ['Item', 'ItemClass', 'AttributeType', 
                                                   'ItemAttributeValue', 'Option', 'ProductRecommendation'])
 

oscar/product/models.py → oscar/apps/product/models.py

@@ -1,22 +1,28 @@
 """
 Vanilla product models
 """
-from oscar.product.abstract_models import *
+from oscar.apps.product.abstract_models import *
+
 
 class ItemClass(AbstractItemClass):
     pass
 
+
 class Item(AbstractItem):
     pass
     
+    
 class AttributeType(AbstractAttributeType):
     pass
 
+
 class AttributeValueOption(AbstractAttributeValueOption):
     pass
 
+
 class ItemAttributeValue(AbstractItemAttributeValue):
     pass
 
+
 class Option(AbstractOption):
     pass