瀏覽代碼

Run source through isort

This also adds isort settings.
master
Michael van Tellingen 9 年之前
父節點
當前提交
a9cc49dee4
共有 100 個檔案被更改,包括 277 行新增254 行删除
  1. 1
    0
      requirements.txt
  2. 8
    0
      setup.cfg
  3. 1
    1
      src/oscar/app.py
  4. 5
    4
      src/oscar/apps/address/abstract_models.py
  5. 1
    0
      src/oscar/apps/address/admin.py
  6. 1
    1
      src/oscar/apps/address/forms.py
  7. 2
    2
      src/oscar/apps/address/models.py
  8. 1
    0
      src/oscar/apps/analytics/abstract_models.py
  9. 1
    0
      src/oscar/apps/analytics/admin.py
  10. 3
    3
      src/oscar/apps/analytics/models.py
  11. 2
    2
      src/oscar/apps/analytics/receivers.py
  12. 1
    2
      src/oscar/apps/analytics/reports.py
  13. 1
    0
      src/oscar/apps/analytics/scores.py
  14. 4
    4
      src/oscar/apps/basket/abstract_models.py
  15. 1
    0
      src/oscar/apps/basket/admin.py
  16. 1
    1
      src/oscar/apps/basket/forms.py
  17. 2
    3
      src/oscar/apps/basket/middleware.py
  18. 1
    1
      src/oscar/apps/basket/models.py
  19. 2
    2
      src/oscar/apps/basket/reports.py
  20. 7
    8
      src/oscar/apps/basket/views.py
  21. 13
    13
      src/oscar/apps/catalogue/abstract_models.py
  22. 2
    2
      src/oscar/apps/catalogue/app.py
  23. 1
    1
      src/oscar/apps/catalogue/models.py
  24. 4
    3
      src/oscar/apps/catalogue/reviews/abstract_models.py
  25. 2
    1
      src/oscar/apps/catalogue/reviews/forms.py
  26. 2
    3
      src/oscar/apps/catalogue/reviews/models.py
  27. 5
    5
      src/oscar/apps/catalogue/reviews/views.py
  28. 0
    1
      src/oscar/apps/catalogue/signals.py
  29. 7
    7
      src/oscar/apps/catalogue/utils.py
  30. 5
    4
      src/oscar/apps/catalogue/views.py
  31. 1
    1
      src/oscar/apps/checkout/app.py
  32. 1
    2
      src/oscar/apps/checkout/forms.py
  33. 2
    2
      src/oscar/apps/checkout/mixins.py
  34. 3
    2
      src/oscar/apps/checkout/session.py
  35. 0
    1
      src/oscar/apps/checkout/signals.py
  36. 3
    2
      src/oscar/apps/checkout/views.py
  37. 2
    3
      src/oscar/apps/customer/abstract_models.py
  38. 1
    0
      src/oscar/apps/customer/admin.py
  39. 2
    1
      src/oscar/apps/customer/alerts/receivers.py
  40. 2
    2
      src/oscar/apps/customer/alerts/utils.py
  41. 4
    5
      src/oscar/apps/customer/alerts/views.py
  42. 3
    4
      src/oscar/apps/customer/forms.py
  43. 2
    1
      src/oscar/apps/customer/history.py
  44. 3
    2
      src/oscar/apps/customer/mixins.py
  45. 1
    1
      src/oscar/apps/customer/models.py
  46. 5
    4
      src/oscar/apps/customer/notifications/views.py
  47. 0
    1
      src/oscar/apps/customer/signals.py
  48. 3
    3
      src/oscar/apps/customer/utils.py
  49. 13
    11
      src/oscar/apps/customer/views.py
  50. 3
    3
      src/oscar/apps/customer/wishlists/views.py
  51. 1
    1
      src/oscar/apps/dashboard/app.py
  52. 3
    3
      src/oscar/apps/dashboard/catalogue/tables.py
  53. 6
    8
      src/oscar/apps/dashboard/catalogue/views.py
  54. 1
    1
      src/oscar/apps/dashboard/catalogue/widgets.py
  55. 3
    3
      src/oscar/apps/dashboard/communications/forms.py
  56. 2
    4
      src/oscar/apps/dashboard/communications/views.py
  57. 0
    1
      src/oscar/apps/dashboard/menu.py
  58. 4
    2
      src/oscar/apps/dashboard/nav.py
  59. 1
    1
      src/oscar/apps/dashboard/offers/app.py
  60. 1
    1
      src/oscar/apps/dashboard/offers/forms.py
  61. 1
    0
      src/oscar/apps/dashboard/offers/reports.py
  62. 5
    5
      src/oscar/apps/dashboard/offers/views.py
  63. 12
    11
      src/oscar/apps/dashboard/orders/views.py
  64. 3
    1
      src/oscar/apps/dashboard/pages/forms.py
  65. 2
    3
      src/oscar/apps/dashboard/pages/views.py
  66. 4
    3
      src/oscar/apps/dashboard/partners/forms.py
  67. 3
    3
      src/oscar/apps/dashboard/partners/views.py
  68. 1
    1
      src/oscar/apps/dashboard/promotions/app.py
  69. 2
    2
      src/oscar/apps/dashboard/promotions/forms.py
  70. 6
    6
      src/oscar/apps/dashboard/promotions/views.py
  71. 5
    5
      src/oscar/apps/dashboard/ranges/views.py
  72. 1
    0
      src/oscar/apps/dashboard/reports/forms.py
  73. 1
    1
      src/oscar/apps/dashboard/reports/reports.py
  74. 1
    0
      src/oscar/apps/dashboard/reports/utils.py
  75. 4
    3
      src/oscar/apps/dashboard/reports/views.py
  76. 2
    1
      src/oscar/apps/dashboard/reviews/forms.py
  77. 1
    0
      src/oscar/apps/dashboard/reviews/utils.py
  78. 5
    5
      src/oscar/apps/dashboard/reviews/views.py
  79. 1
    1
      src/oscar/apps/dashboard/shipping/views.py
  80. 0
    1
      src/oscar/apps/dashboard/tables.py
  81. 3
    2
      src/oscar/apps/dashboard/users/forms.py
  82. 1
    1
      src/oscar/apps/dashboard/users/tables.py
  83. 5
    6
      src/oscar/apps/dashboard/users/views.py
  84. 5
    4
      src/oscar/apps/dashboard/views.py
  85. 1
    3
      src/oscar/apps/dashboard/vouchers/views.py
  86. 8
    8
      src/oscar/apps/offer/abstract_models.py
  87. 1
    0
      src/oscar/apps/offer/admin.py
  88. 2
    2
      src/oscar/apps/offer/applicator.py
  89. 1
    1
      src/oscar/apps/offer/benefits.py
  90. 4
    3
      src/oscar/apps/offer/conditions.py
  91. 1
    1
      src/oscar/apps/offer/custom.py
  92. 1
    1
      src/oscar/apps/offer/managers.py
  93. 8
    9
      src/oscar/apps/offer/models.py
  94. 1
    2
      src/oscar/apps/offer/reports.py
  95. 1
    1
      src/oscar/apps/offer/views.py
  96. 6
    4
      src/oscar/apps/order/abstract_models.py
  97. 1
    0
      src/oscar/apps/order/admin.py
  98. 3
    3
      src/oscar/apps/order/models.py
  99. 1
    1
      src/oscar/apps/order/processing.py
  100. 0
    0
      src/oscar/apps/order/reports.py

+ 1
- 0
requirements.txt 查看文件

33
 tox==1.8.1
33
 tox==1.8.1
34
 coveralls==0.4.4
34
 coveralls==0.4.4
35
 behave==1.2.4
35
 behave==1.2.4
36
+isort==4.2.2
36
 
37
 
37
 # Misc
38
 # Misc
38
 flake8==2.2.5
39
 flake8==2.2.5

+ 8
- 0
setup.cfg 查看文件

8
 
8
 
9
 [flake8]
9
 [flake8]
10
 max-line-length=99
10
 max-line-length=99
11
+
12
+[isort]
13
+line_length = 79
14
+multi_line_output = 4
15
+balanced_wrapping = true
16
+known_first_party = oscar,tests
17
+use_parentheses = true
18
+skip_glob=*/src/oscar/**/migrations/*.py,*/tests/**/*.py

+ 1
- 1
src/oscar/app.py 查看文件

1
 # flake8: noqa, because URL syntax is more readable with long lines
1
 # flake8: noqa, because URL syntax is more readable with long lines
2
 
2
 
3
-from django.conf.urls import url, include
3
+from django.conf.urls import include, url
4
 from django.contrib.auth import views as auth_views
4
 from django.contrib.auth import views as auth_views
5
 from django.core.urlresolvers import reverse_lazy
5
 from django.core.urlresolvers import reverse_lazy
6
 
6
 

+ 5
- 4
src/oscar/apps/address/abstract_models.py 查看文件

2
 import zlib
2
 import zlib
3
 
3
 
4
 from django.conf import settings
4
 from django.conf import settings
5
+from django.core import exceptions
5
 from django.db import models
6
 from django.db import models
6
 from django.utils.encoding import python_2_unicode_compatible
7
 from django.utils.encoding import python_2_unicode_compatible
7
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
8
-from django.core import exceptions
8
+from django.utils.six.moves import filter
9
+from django.utils.translation import ugettext_lazy as _
10
+from django.utils.translation import pgettext_lazy
9
 
11
 
10
 from oscar.core.compat import AUTH_USER_MODEL
12
 from oscar.core.compat import AUTH_USER_MODEL
11
-from oscar.models.fields import UppercaseCharField, PhoneNumberField
12
-from django.utils.six.moves import filter
13
+from oscar.models.fields import PhoneNumberField, UppercaseCharField
13
 
14
 
14
 
15
 
15
 @python_2_unicode_compatible
16
 @python_2_unicode_compatible

+ 1
- 0
src/oscar/apps/address/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 
5
 

+ 1
- 1
src/oscar/apps/address/forms.py 查看文件

1
-from django.conf import settings
2
 from django import forms
1
 from django import forms
2
+from django.conf import settings
3
 
3
 
4
 from oscar.core.loading import get_model
4
 from oscar.core.loading import get_model
5
 from oscar.views.generic import PhoneNumberMixin
5
 from oscar.views.generic import PhoneNumberMixin

+ 2
- 2
src/oscar/apps/address/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
2
 from oscar.apps.address.abstract_models import (
1
 from oscar.apps.address.abstract_models import (
3
-    AbstractUserAddress, AbstractCountry)
2
+    AbstractCountry, AbstractUserAddress)
3
+from oscar.core.loading import is_model_registered
4
 
4
 
5
 __all__ = []
5
 __all__ = []
6
 
6
 

+ 1
- 0
src/oscar/apps/analytics/abstract_models.py 查看文件

3
 from django.db import models
3
 from django.db import models
4
 from django.utils.encoding import python_2_unicode_compatible
4
 from django.utils.encoding import python_2_unicode_compatible
5
 from django.utils.translation import ugettext_lazy as _
5
 from django.utils.translation import ugettext_lazy as _
6
+
6
 from oscar.core.compat import AUTH_USER_MODEL
7
 from oscar.core.compat import AUTH_USER_MODEL
7
 
8
 
8
 
9
 

+ 1
- 0
src/oscar/apps/analytics/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 
5
 

+ 3
- 3
src/oscar/apps/analytics/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
2
 from oscar.apps.analytics.abstract_models import (
1
 from oscar.apps.analytics.abstract_models import (
3
-    AbstractProductRecord, AbstractUserRecord,
4
-    AbstractUserProductView, AbstractUserSearch)
2
+    AbstractProductRecord, AbstractUserProductView,
3
+    AbstractUserRecord, AbstractUserSearch)
4
+from oscar.core.loading import is_model_registered
5
 
5
 
6
 __all__ = []
6
 __all__ = []
7
 
7
 

+ 2
- 2
src/oscar/apps/analytics/receivers.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
+from django.db import IntegrityError
3
 from django.db.models import F
4
 from django.db.models import F
4
 from django.dispatch import receiver
5
 from django.dispatch import receiver
5
-from django.db import IntegrityError
6
 
6
 
7
-from oscar.core.loading import get_class, get_classes
8
 from oscar.apps.search.signals import user_search
7
 from oscar.apps.search.signals import user_search
8
+from oscar.core.loading import get_class, get_classes
9
 
9
 
10
 UserSearch, UserRecord, ProductRecord, UserProductView = get_classes(
10
 UserSearch, UserRecord, ProductRecord, UserProductView = get_classes(
11
     'analytics.models', ['UserSearch', 'UserRecord', 'ProductRecord',
11
     'analytics.models', ['UserSearch', 'UserRecord', 'ProductRecord',

+ 1
- 2
src/oscar/apps/analytics/reports.py 查看文件

1
-from oscar.core.loading import get_model
2
 from django.utils.translation import ugettext_lazy as _
1
 from django.utils.translation import ugettext_lazy as _
3
 
2
 
4
-from oscar.core.loading import get_class
3
+from oscar.core.loading import get_class, get_model
5
 
4
 
6
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
5
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
7
 ReportCSVFormatter = get_class('dashboard.reports.reports',
6
 ReportCSVFormatter = get_class('dashboard.reports.reports',

+ 1
- 0
src/oscar/apps/analytics/scores.py 查看文件

1
 from django.db.models import F
1
 from django.db.models import F
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 ProductRecord = get_model('analytics', 'ProductRecord')
5
 ProductRecord = get_model('analytics', 'ProductRecord')

+ 4
- 4
src/oscar/apps/basket/abstract_models.py 查看文件

1
-from decimal import Decimal as D
2
 import zlib
1
 import zlib
2
+from decimal import Decimal as D
3
 
3
 
4
+from django.conf import settings
5
+from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
4
 from django.db import models
6
 from django.db import models
5
 from django.db.models import Sum
7
 from django.db.models import Sum
6
-from django.conf import settings
7
 from django.utils.encoding import python_2_unicode_compatible, smart_text
8
 from django.utils.encoding import python_2_unicode_compatible, smart_text
8
 from django.utils.timezone import now
9
 from django.utils.timezone import now
9
 from django.utils.translation import ugettext_lazy as _
10
 from django.utils.translation import ugettext_lazy as _
10
-from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
11
 
11
 
12
 from oscar.apps.basket.managers import OpenBasketManager, SavedBasketManager
12
 from oscar.apps.basket.managers import OpenBasketManager, SavedBasketManager
13
 from oscar.apps.offer import results
13
 from oscar.apps.offer import results
14
-from oscar.core.utils import get_default_currency
15
 from oscar.core.compat import AUTH_USER_MODEL
14
 from oscar.core.compat import AUTH_USER_MODEL
15
+from oscar.core.utils import get_default_currency
16
 from oscar.templatetags.currency_filters import currency
16
 from oscar.templatetags.currency_filters import currency
17
 
17
 
18
 
18
 

+ 1
- 0
src/oscar/apps/basket/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 Line = get_model('basket', 'line')
5
 Line = get_model('basket', 'line')

+ 1
- 1
src/oscar/apps/basket/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
 from django.conf import settings
2
 from django.conf import settings
3
-from django.forms.models import modelformset_factory, BaseModelFormSet
4
 from django.db.models import Sum
3
 from django.db.models import Sum
4
+from django.forms.models import BaseModelFormSet, modelformset_factory
5
 from django.utils.translation import ugettext_lazy as _
5
 from django.utils.translation import ugettext_lazy as _
6
 
6
 
7
 from oscar.core.loading import get_model
7
 from oscar.core.loading import get_model

+ 2
- 3
src/oscar/apps/basket/middleware.py 查看文件

1
 from django.conf import settings
1
 from django.conf import settings
2
-from django.core.signing import Signer, BadSignature
2
+from django.core.signing import BadSignature, Signer
3
 from django.utils.functional import SimpleLazyObject, empty
3
 from django.utils.functional import SimpleLazyObject, empty
4
 
4
 
5
-from oscar.core.loading import get_model
6
-from oscar.core.loading import get_class
5
+from oscar.core.loading import get_class, get_model
7
 
6
 
8
 Applicator = get_class('offer.utils', 'Applicator')
7
 Applicator = get_class('offer.utils', 'Applicator')
9
 Basket = get_model('basket', 'basket')
8
 Basket = get_model('basket', 'basket')

+ 1
- 1
src/oscar/apps/basket/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
2
 from oscar.apps.basket.abstract_models import (
1
 from oscar.apps.basket.abstract_models import (
3
     AbstractBasket, AbstractLine, AbstractLineAttribute)
2
     AbstractBasket, AbstractLine, AbstractLineAttribute)
3
+from oscar.core.loading import is_model_registered
4
 
4
 
5
 __all__ = [
5
 __all__ = [
6
     'InvalidBasketLineError',
6
     'InvalidBasketLineError',

+ 2
- 2
src/oscar/apps/basket/reports.py 查看文件

1
-from oscar.core.loading import get_model
2
 from django.utils.translation import ugettext_lazy as _
1
 from django.utils.translation import ugettext_lazy as _
3
-from oscar.core.loading import get_class
2
+
3
+from oscar.core.loading import get_class, get_model
4
 
4
 
5
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
5
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
6
 ReportCSVFormatter = get_class('dashboard.reports.reports',
6
 ReportCSVFormatter = get_class('dashboard.reports.reports',

+ 7
- 8
src/oscar/apps/basket/views.py 查看文件

2
 
2
 
3
 from django import shortcuts
3
 from django import shortcuts
4
 from django.contrib import messages
4
 from django.contrib import messages
5
-from django.shortcuts import redirect
6
-from django.template.loader import render_to_string
7
-from django.template import RequestContext
5
+from django.core.exceptions import ObjectDoesNotExist
8
 from django.core.urlresolvers import reverse
6
 from django.core.urlresolvers import reverse
9
 from django.http import HttpResponse
7
 from django.http import HttpResponse
10
-from django.views.generic import FormView, View
8
+from django.shortcuts import redirect
9
+from django.template import RequestContext
10
+from django.template.loader import render_to_string
11
 from django.utils.http import is_safe_url
11
 from django.utils.http import is_safe_url
12
 from django.utils.translation import ugettext_lazy as _
12
 from django.utils.translation import ugettext_lazy as _
13
-from django.core.exceptions import ObjectDoesNotExist
14
-
13
+from django.views.generic import FormView, View
15
 from extra_views import ModelFormSetView
14
 from extra_views import ModelFormSetView
16
 
15
 
17
-from oscar.core import ajax
18
-from oscar.core.utils import redirect_to_referrer, safe_referrer
19
 from oscar.apps.basket import signals
16
 from oscar.apps.basket import signals
17
+from oscar.core import ajax
20
 from oscar.core.loading import get_class, get_classes, get_model
18
 from oscar.core.loading import get_class, get_classes, get_model
19
+from oscar.core.utils import redirect_to_referrer, safe_referrer
21
 
20
 
22
 Applicator = get_class('offer.utils', 'Applicator')
21
 Applicator = get_class('offer.utils', 'Applicator')
23
 (BasketLineFormSet, BasketLineForm, AddToBasketForm, BasketVoucherForm,
22
 (BasketLineFormSet, BasketLineForm, AddToBasketForm, BasketVoucherForm,

+ 13
- 13
src/oscar/apps/catalogue/abstract_models.py 查看文件

1
-import os
2
-from django.utils import six
3
-from datetime import datetime, date
4
 import logging
1
 import logging
2
+import os
3
+from datetime import date, datetime
5
 
4
 
6
-from django.utils.html import strip_tags
7
-from django.utils.safestring import mark_safe
8
 from django.conf import settings
5
 from django.conf import settings
6
+from django.contrib.contenttypes.fields import GenericForeignKey
7
+from django.contrib.contenttypes.models import ContentType
9
 from django.contrib.staticfiles.finders import find
8
 from django.contrib.staticfiles.finders import find
10
 from django.core.cache import cache
9
 from django.core.cache import cache
11
-from django.core.exceptions import ValidationError, ImproperlyConfigured
10
+from django.core.exceptions import ImproperlyConfigured, ValidationError
12
 from django.core.files.base import File
11
 from django.core.files.base import File
13
 from django.core.urlresolvers import reverse
12
 from django.core.urlresolvers import reverse
14
 from django.core.validators import RegexValidator
13
 from django.core.validators import RegexValidator
15
 from django.db import models
14
 from django.db import models
16
-from django.db.models import Sum, Count
15
+from django.db.models import Count, Sum
16
+from django.utils import six
17
 from django.utils.encoding import python_2_unicode_compatible
17
 from django.utils.encoding import python_2_unicode_compatible
18
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
19
 from django.utils.functional import cached_property
18
 from django.utils.functional import cached_property
20
-from django.contrib.contenttypes.fields import GenericForeignKey
21
-from django.contrib.contenttypes.models import ContentType
22
-
19
+from django.utils.html import strip_tags
20
+from django.utils.safestring import mark_safe
21
+from django.utils.translation import ugettext_lazy as _
22
+from django.utils.translation import pgettext_lazy
23
 from treebeard.mp_tree import MP_Node
23
 from treebeard.mp_tree import MP_Node
24
 
24
 
25
 from oscar.core.decorators import deprecated
25
 from oscar.core.decorators import deprecated
26
+from oscar.core.loading import get_class, get_classes, get_model
26
 from oscar.core.utils import slugify
27
 from oscar.core.utils import slugify
27
 from oscar.core.validators import non_python_keyword
28
 from oscar.core.validators import non_python_keyword
28
-from oscar.core.loading import get_classes, get_model, get_class
29
-from oscar.models.fields import NullCharField, AutoSlugField
29
+from oscar.models.fields import AutoSlugField, NullCharField
30
 
30
 
31
 ProductManager, BrowsableProductManager = get_classes(
31
 ProductManager, BrowsableProductManager = get_classes(
32
     'catalogue.managers', ['ProductManager', 'BrowsableProductManager'])
32
     'catalogue.managers', ['ProductManager', 'BrowsableProductManager'])

+ 2
- 2
src/oscar/apps/catalogue/app.py 查看文件

1
-from django.conf.urls import url, include
1
+from django.conf.urls import include, url
2
 
2
 
3
+from oscar.apps.catalogue.reviews.app import application as reviews_app
3
 from oscar.core.application import Application
4
 from oscar.core.application import Application
4
 from oscar.core.loading import get_class
5
 from oscar.core.loading import get_class
5
-from oscar.apps.catalogue.reviews.app import application as reviews_app
6
 
6
 
7
 
7
 
8
 class BaseCatalogueApplication(Application):
8
 class BaseCatalogueApplication(Application):

+ 1
- 1
src/oscar/apps/catalogue/models.py 查看文件

1
 """
1
 """
2
 Vanilla product models
2
 Vanilla product models
3
 """
3
 """
4
-from oscar.core.loading import is_model_registered
5
 from oscar.apps.catalogue.abstract_models import *  # noqa
4
 from oscar.apps.catalogue.abstract_models import *  # noqa
5
+from oscar.core.loading import is_model_registered
6
 
6
 
7
 __all__ = ['ProductAttributesContainer']
7
 __all__ = ['ProductAttributesContainer']
8
 
8
 

+ 4
- 3
src/oscar/apps/catalogue/reviews/abstract_models.py 查看文件

2
 from django.core.exceptions import ValidationError
2
 from django.core.exceptions import ValidationError
3
 from django.core.urlresolvers import reverse
3
 from django.core.urlresolvers import reverse
4
 from django.db import models
4
 from django.db import models
5
-from django.db.models import Sum, Count
5
+from django.db.models import Count, Sum
6
 from django.utils.encoding import python_2_unicode_compatible
6
 from django.utils.encoding import python_2_unicode_compatible
7
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
7
+from django.utils.translation import ugettext_lazy as _
8
+from django.utils.translation import pgettext_lazy
8
 
9
 
9
 from oscar.apps.catalogue.reviews.managers import ApprovedReviewsManager
10
 from oscar.apps.catalogue.reviews.managers import ApprovedReviewsManager
10
-from oscar.core.compat import AUTH_USER_MODEL
11
 from oscar.core import validators
11
 from oscar.core import validators
12
+from oscar.core.compat import AUTH_USER_MODEL
12
 
13
 
13
 
14
 
14
 @python_2_unicode_compatible
15
 @python_2_unicode_compatible

+ 2
- 1
src/oscar/apps/catalogue/reviews/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
-from oscar.core.loading import get_model
3
 from django.utils.translation import ugettext_lazy as _
2
 from django.utils.translation import ugettext_lazy as _
4
 
3
 
4
+from oscar.core.loading import get_model
5
+
5
 Vote = get_model('reviews', 'vote')
6
 Vote = get_model('reviews', 'vote')
6
 ProductReview = get_model('reviews', 'productreview')
7
 ProductReview = get_model('reviews', 'productreview')
7
 
8
 

+ 2
- 3
src/oscar/apps/catalogue/reviews/models.py 查看文件

1
+from oscar.apps.catalogue.reviews.abstract_models import (
2
+    AbstractProductReview, AbstractVote)
1
 from oscar.core.loading import is_model_registered
3
 from oscar.core.loading import is_model_registered
2
-from oscar.apps.catalogue.reviews.abstract_models import \
3
-    AbstractProductReview, AbstractVote
4
-
5
 
4
 
6
 if not is_model_registered('reviews', 'ProductReview'):
5
 if not is_model_registered('reviews', 'ProductReview'):
7
     class ProductReview(AbstractProductReview):
6
     class ProductReview(AbstractProductReview):

+ 5
- 5
src/oscar/apps/catalogue/reviews/views.py 查看文件

1
-from django.shortcuts import get_object_or_404, redirect
2
-from django.views.generic import ListView, DetailView, CreateView, View
1
+from django.conf import settings
3
 from django.contrib import messages
2
 from django.contrib import messages
3
+from django.shortcuts import get_object_or_404, redirect
4
 from django.utils.translation import ugettext_lazy as _
4
 from django.utils.translation import ugettext_lazy as _
5
-from django.conf import settings
5
+from django.views.generic import CreateView, DetailView, ListView, View
6
 
6
 
7
-from oscar.core.loading import get_model, get_classes
8
-from oscar.core.utils import redirect_to_referrer
9
 from oscar.apps.catalogue.reviews.signals import review_added
7
 from oscar.apps.catalogue.reviews.signals import review_added
8
+from oscar.core.loading import get_classes, get_model
9
+from oscar.core.utils import redirect_to_referrer
10
 
10
 
11
 ProductReviewForm, VoteForm, SortReviewsForm = get_classes(
11
 ProductReviewForm, VoteForm, SortReviewsForm = get_classes(
12
     'catalogue.reviews.forms',
12
     'catalogue.reviews.forms',

+ 0
- 1
src/oscar/apps/catalogue/signals.py 查看文件

1
 import django.dispatch
1
 import django.dispatch
2
 
2
 
3
-
4
 product_viewed = django.dispatch.Signal(
3
 product_viewed = django.dispatch.Signal(
5
     providing_args=["product", "user", "request", "response"])
4
     providing_args=["product", "user", "request", "response"])

+ 7
- 7
src/oscar/apps/catalogue/utils.py 查看文件

1
 import os
1
 import os
2
-import zlib
2
+import shutil
3
 import tarfile
3
 import tarfile
4
-import zipfile
5
 import tempfile
4
 import tempfile
6
-import shutil
7
-from PIL import Image
5
+import zipfile
6
+import zlib
8
 
7
 
9
-from django.core.files import File
10
 from django.core.exceptions import FieldError
8
 from django.core.exceptions import FieldError
9
+from django.core.files import File
11
 from django.db.transaction import atomic
10
 from django.db.transaction import atomic
12
 from django.utils.translation import ugettext_lazy as _
11
 from django.utils.translation import ugettext_lazy as _
12
+from PIL import Image
13
 
13
 
14
-from oscar.core.loading import get_model
15
 from oscar.apps.catalogue.exceptions import (
14
 from oscar.apps.catalogue.exceptions import (
16
-    ImageImportError, IdenticalImageError, InvalidImageArchive)
15
+    IdenticalImageError, ImageImportError, InvalidImageArchive)
16
+from oscar.core.loading import get_model
17
 
17
 
18
 Category = get_model('catalogue', 'category')
18
 Category = get_model('catalogue', 'category')
19
 Product = get_model('catalogue', 'product')
19
 Product = get_model('catalogue', 'product')

+ 5
- 4
src/oscar/apps/catalogue/views.py 查看文件

1
 import warnings
1
 import warnings
2
+
2
 from django.contrib import messages
3
 from django.contrib import messages
3
 from django.core.paginator import InvalidPage
4
 from django.core.paginator import InvalidPage
4
-from django.utils.http import urlquote
5
-from django.http import HttpResponsePermanentRedirect, Http404
5
+from django.http import Http404, HttpResponsePermanentRedirect
6
 from django.shortcuts import get_object_or_404, redirect
6
 from django.shortcuts import get_object_or_404, redirect
7
-from django.views.generic import DetailView, TemplateView
7
+from django.utils.http import urlquote
8
 from django.utils.translation import ugettext_lazy as _
8
 from django.utils.translation import ugettext_lazy as _
9
+from django.views.generic import DetailView, TemplateView
9
 
10
 
10
-from oscar.core.loading import get_class, get_model
11
 from oscar.apps.catalogue.signals import product_viewed
11
 from oscar.apps.catalogue.signals import product_viewed
12
+from oscar.core.loading import get_class, get_model
12
 
13
 
13
 Product = get_model('catalogue', 'product')
14
 Product = get_model('catalogue', 'product')
14
 ProductReview = get_model('reviews', 'ProductReview')
15
 ProductReview = get_model('reviews', 'ProductReview')

+ 1
- 1
src/oscar/apps/checkout/app.py 查看文件

1
+from django.conf import settings
1
 from django.conf.urls import url
2
 from django.conf.urls import url
2
 from django.contrib.auth.decorators import login_required
3
 from django.contrib.auth.decorators import login_required
3
-from django.conf import settings
4
 
4
 
5
 from oscar.core.application import Application
5
 from oscar.core.application import Application
6
 from oscar.core.loading import get_class
6
 from oscar.core.loading import get_class

+ 1
- 2
src/oscar/apps/checkout/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
-from oscar.core.loading import get_model
3
 from django.contrib.auth.forms import AuthenticationForm
2
 from django.contrib.auth.forms import AuthenticationForm
4
 from django.utils.translation import ugettext_lazy as _
3
 from django.utils.translation import ugettext_lazy as _
5
 
4
 
6
 from oscar.apps.address.forms import AbstractAddressForm
5
 from oscar.apps.address.forms import AbstractAddressForm
7
 from oscar.apps.customer.utils import normalise_email
6
 from oscar.apps.customer.utils import normalise_email
8
 from oscar.core.compat import get_user_model
7
 from oscar.core.compat import get_user_model
9
-
8
+from oscar.core.loading import get_model
10
 from oscar.views.generic import PhoneNumberMixin
9
 from oscar.views.generic import PhoneNumberMixin
11
 
10
 
12
 User = get_user_model()
11
 User = get_user_model()

+ 2
- 2
src/oscar/apps/checkout/mixins.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
-from django.http import HttpResponseRedirect
4
-from django.core.urlresolvers import reverse, NoReverseMatch
5
 from django.contrib.sites.models import Site, get_current_site
3
 from django.contrib.sites.models import Site, get_current_site
6
 from django.core.exceptions import ObjectDoesNotExist
4
 from django.core.exceptions import ObjectDoesNotExist
5
+from django.core.urlresolvers import NoReverseMatch, reverse
6
+from django.http import HttpResponseRedirect
7
 
7
 
8
 from oscar.core.loading import get_class, get_model
8
 from oscar.core.loading import get_class, get_model
9
 
9
 

+ 3
- 2
src/oscar/apps/checkout/session.py 查看文件

1
 from decimal import Decimal as D
1
 from decimal import Decimal as D
2
 
2
 
3
-from django.contrib import messages
4
 from django import http
3
 from django import http
4
+from django.contrib import messages
5
 from django.core.exceptions import ImproperlyConfigured
5
 from django.core.exceptions import ImproperlyConfigured
6
 from django.core.urlresolvers import reverse
6
 from django.core.urlresolvers import reverse
7
 from django.utils.translation import ugettext_lazy as _
7
 from django.utils.translation import ugettext_lazy as _
8
 
8
 
9
 from oscar.core import prices
9
 from oscar.core import prices
10
-from oscar.core.loading import get_model, get_class
10
+from oscar.core.loading import get_class, get_model
11
+
11
 from . import exceptions
12
 from . import exceptions
12
 
13
 
13
 Repository = get_class('shipping.repository', 'Repository')
14
 Repository = get_class('shipping.repository', 'Repository')

+ 0
- 1
src/oscar/apps/checkout/signals.py 查看文件

1
 from django.dispatch import Signal
1
 from django.dispatch import Signal
2
 
2
 
3
-
4
 start_checkout = Signal(providing_args=["request"])
3
 start_checkout = Signal(providing_args=["request"])
5
 pre_payment = Signal(providing_args=["view"])
4
 pre_payment = Signal(providing_args=["view"])
6
 post_payment = Signal(providing_args=["view"])
5
 post_payment = Signal(providing_args=["view"])

+ 3
- 2
src/oscar/apps/checkout/views.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
 from django import http
3
 from django import http
4
-from django.shortcuts import redirect
5
 from django.contrib import messages
4
 from django.contrib import messages
6
 from django.contrib.auth import login
5
 from django.contrib.auth import login
7
 from django.core.urlresolvers import reverse, reverse_lazy
6
 from django.core.urlresolvers import reverse, reverse_lazy
7
+from django.shortcuts import redirect
8
+from django.utils import six
8
 from django.utils.http import urlquote
9
 from django.utils.http import urlquote
9
 from django.utils.translation import ugettext as _
10
 from django.utils.translation import ugettext as _
10
-from django.utils import six
11
 from django.views import generic
11
 from django.views import generic
12
 
12
 
13
 from oscar.apps.shipping.methods import NoShippingRequired
13
 from oscar.apps.shipping.methods import NoShippingRequired
14
 from oscar.core.loading import get_class, get_classes, get_model
14
 from oscar.core.loading import get_class, get_classes, get_model
15
+
15
 from . import signals
16
 from . import signals
16
 
17
 
17
 ShippingAddressForm, GatewayForm \
18
 ShippingAddressForm, GatewayForm \

+ 2
- 3
src/oscar/apps/customer/abstract_models.py 查看文件

1
-from django.utils import six
2
 import hashlib
1
 import hashlib
3
 import random
2
 import random
4
 
3
 
7
 from django.core.urlresolvers import reverse
6
 from django.core.urlresolvers import reverse
8
 from django.core.validators import RegexValidator
7
 from django.core.validators import RegexValidator
9
 from django.db import models
8
 from django.db import models
10
-from django.template import Template, Context, TemplateDoesNotExist
9
+from django.template import Context, Template, TemplateDoesNotExist
11
 from django.template.loader import get_template
10
 from django.template.loader import get_template
12
-from django.utils import timezone
11
+from django.utils import six, timezone
13
 from django.utils.encoding import python_2_unicode_compatible
12
 from django.utils.encoding import python_2_unicode_compatible
14
 from django.utils.translation import ugettext_lazy as _
13
 from django.utils.translation import ugettext_lazy as _
15
 
14
 

+ 1
- 0
src/oscar/apps/customer/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
5
 CommunicationEventType = get_model('customer', 'CommunicationEventType')

+ 2
- 1
src/oscar/apps/customer/alerts/receivers.py 查看文件

1
 from django.conf import settings
1
 from django.conf import settings
2
-from oscar.core.loading import get_model
3
 from django.db.models.signals import post_save
2
 from django.db.models.signals import post_save
4
 
3
 
4
+from oscar.core.loading import get_model
5
+
5
 
6
 
6
 def send_product_alerts(sender, instance, created, **kwargs):
7
 def send_product_alerts(sender, instance, created, **kwargs):
7
     if kwargs.get('raw', False):
8
     if kwargs.get('raw', False):

+ 2
- 2
src/oscar/apps/customer/alerts/utils.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
-from django.core import mail
4
 from django.conf import settings
3
 from django.conf import settings
5
-from django.template import loader, Context
6
 from django.contrib.sites.models import Site
4
 from django.contrib.sites.models import Site
5
+from django.core import mail
7
 from django.db.models import Max
6
 from django.db.models import Max
7
+from django.template import Context, loader
8
 
8
 
9
 from oscar.apps.customer.notifications import services
9
 from oscar.apps.customer.notifications import services
10
 from oscar.core.loading import get_class, get_model
10
 from oscar.core.loading import get_class, get_model

+ 4
- 5
src/oscar/apps/customer/alerts/views.py 查看文件

1
+from django import http
2
+from django.contrib import messages
1
 from django.http import Http404
3
 from django.http import Http404
2
-from django.views import generic
3
-from oscar.core.loading import get_model
4
 from django.shortcuts import get_object_or_404
4
 from django.shortcuts import get_object_or_404
5
-from django.contrib import messages
6
 from django.utils.translation import ugettext_lazy as _
5
 from django.utils.translation import ugettext_lazy as _
7
-from django import http
6
+from django.views import generic
8
 
7
 
9
-from oscar.core.loading import get_class
10
 from oscar.apps.customer.alerts import utils
8
 from oscar.apps.customer.alerts import utils
11
 from oscar.apps.customer.mixins import PageTitleMixin
9
 from oscar.apps.customer.mixins import PageTitleMixin
10
+from oscar.core.loading import get_class, get_model
12
 
11
 
13
 Product = get_model('catalogue', 'Product')
12
 Product = get_model('catalogue', 'Product')
14
 ProductAlert = get_model('customer', 'ProductAlert')
13
 ProductAlert = get_model('customer', 'ProductAlert')

+ 3
- 4
src/oscar/apps/customer/forms.py 查看文件

1
-import string
2
 import random
1
 import random
2
+import string
3
 
3
 
4
 from django import forms
4
 from django import forms
5
 from django.conf import settings
5
 from django.conf import settings
11
 from django.utils.translation import ugettext_lazy as _
11
 from django.utils.translation import ugettext_lazy as _
12
 from django.utils.translation import pgettext_lazy
12
 from django.utils.translation import pgettext_lazy
13
 
13
 
14
-
15
 from oscar.apps.customer.utils import get_password_reset_url, normalise_email
14
 from oscar.apps.customer.utils import get_password_reset_url, normalise_email
16
-from oscar.core.loading import get_profile_class, get_class, get_model
17
-from oscar.core.compat import get_user_model, existing_user_fields
15
+from oscar.core.compat import existing_user_fields, get_user_model
16
+from oscar.core.loading import get_class, get_model, get_profile_class
18
 from oscar.core.validators import password_validators
17
 from oscar.core.validators import password_validators
19
 from oscar.forms import widgets
18
 from oscar.forms import widgets
20
 
19
 

+ 2
- 1
src/oscar/apps/customer/history.py 查看文件

1
 import json
1
 import json
2
 
2
 
3
 from django.conf import settings
3
 from django.conf import settings
4
-from oscar.core.loading import get_model, get_class
4
+
5
+from oscar.core.loading import get_class, get_model
5
 
6
 
6
 product_viewed = get_class('catalogue.signals', 'product_viewed')
7
 product_viewed = get_class('catalogue.signals', 'product_viewed')
7
 Product = get_model('catalogue', 'Product')
8
 Product = get_model('catalogue', 'Product')

+ 3
- 2
src/oscar/apps/customer/mixins.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
 from django.conf import settings
3
 from django.conf import settings
4
-from django.contrib.auth import authenticate, login as auth_login
4
+from django.contrib.auth import login as auth_login
5
+from django.contrib.auth import authenticate
5
 from django.contrib.sites.models import get_current_site
6
 from django.contrib.sites.models import get_current_site
6
 
7
 
7
-from oscar.core.loading import get_model, get_class
8
 from oscar.apps.customer.signals import user_registered
8
 from oscar.apps.customer.signals import user_registered
9
 from oscar.core.compat import get_user_model
9
 from oscar.core.compat import get_user_model
10
+from oscar.core.loading import get_class, get_model
10
 
11
 
11
 User = get_user_model()
12
 User = get_user_model()
12
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
13
 CommunicationEventType = get_model('customer', 'CommunicationEventType')

+ 1
- 1
src/oscar/apps/customer/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
2
 from oscar.apps.customer import abstract_models
1
 from oscar.apps.customer import abstract_models
2
+from oscar.core.loading import is_model_registered
3
 
3
 
4
 __all__ = []
4
 __all__ = []
5
 
5
 

+ 5
- 4
src/oscar/apps/customer/notifications/views.py 查看文件

1
+from django.conf import settings
2
+from django.contrib import messages
1
 from django.utils.html import strip_tags
3
 from django.utils.html import strip_tags
2
-from django.utils.translation import ugettext_lazy as _, ungettext
3
 from django.utils.timezone import now
4
 from django.utils.timezone import now
4
-from django.contrib import messages
5
+from django.utils.translation import ugettext_lazy as _
6
+from django.utils.translation import ungettext
5
 from django.views import generic
7
 from django.views import generic
6
-from django.conf import settings
7
 
8
 
9
+from oscar.apps.customer.mixins import PageTitleMixin
8
 from oscar.core.loading import get_model
10
 from oscar.core.loading import get_model
9
 from oscar.core.utils import redirect_to_referrer
11
 from oscar.core.utils import redirect_to_referrer
10
-from oscar.apps.customer.mixins import PageTitleMixin
11
 from oscar.views.generic import BulkEditMixin
12
 from oscar.views.generic import BulkEditMixin
12
 
13
 
13
 Notification = get_model('customer', 'Notification')
14
 Notification = get_model('customer', 'Notification')

+ 0
- 1
src/oscar/apps/customer/signals.py 查看文件

1
 from django.dispatch import Signal
1
 from django.dispatch import Signal
2
 
2
 
3
-
4
 user_registered = Signal(providing_args=["request", "user"])
3
 user_registered = Signal(providing_args=["request", "user"])
5
 user_logged_in = Signal(providing_args=["request", "user"])
4
 user_logged_in = Signal(providing_args=["request", "user"])

+ 3
- 3
src/oscar/apps/customer/utils.py 查看文件

1
 import logging
1
 import logging
2
 
2
 
3
-from django.core.mail import EmailMessage, EmailMultiAlternatives
4
-from django.core.urlresolvers import reverse
5
 from django.conf import settings
3
 from django.conf import settings
6
 from django.contrib.auth.tokens import default_token_generator
4
 from django.contrib.auth.tokens import default_token_generator
7
-from django.utils.http import urlsafe_base64_encode
5
+from django.core.mail import EmailMessage, EmailMultiAlternatives
6
+from django.core.urlresolvers import reverse
8
 from django.utils.encoding import force_bytes
7
 from django.utils.encoding import force_bytes
8
+from django.utils.http import urlsafe_base64_encode
9
 
9
 
10
 from oscar.core.loading import get_model
10
 from oscar.core.loading import get_model
11
 
11
 

+ 13
- 11
src/oscar/apps/customer/views.py 查看文件

1
-from django.shortcuts import get_object_or_404, redirect
2
-from django.views import generic
3
-from django.core.urlresolvers import reverse, reverse_lazy
4
-from django.core.exceptions import ObjectDoesNotExist
5
 from django import http
1
 from django import http
2
+from django.conf import settings
6
 from django.contrib import messages
3
 from django.contrib import messages
7
-from django.utils.translation import ugettext_lazy as _
8
-from django.contrib.auth import logout as auth_logout, login as auth_login
4
+from django.contrib.auth import login as auth_login
5
+from django.contrib.auth import logout as auth_logout
9
 from django.contrib.sites.models import get_current_site
6
 from django.contrib.sites.models import get_current_site
10
-from django.conf import settings
7
+from django.core.exceptions import ObjectDoesNotExist
8
+from django.core.urlresolvers import reverse, reverse_lazy
9
+from django.shortcuts import get_object_or_404, redirect
10
+from django.utils.translation import ugettext_lazy as _
11
+from django.views import generic
11
 
12
 
12
-from oscar.core.utils import safe_referrer
13
-from oscar.views.generic import PostActionMixin
14
 from oscar.apps.customer.utils import get_password_reset_url
13
 from oscar.apps.customer.utils import get_password_reset_url
15
-from oscar.core.loading import (
16
-    get_class, get_profile_class, get_classes, get_model)
17
 from oscar.core.compat import get_user_model
14
 from oscar.core.compat import get_user_model
15
+from oscar.core.loading import (
16
+    get_class, get_classes, get_model, get_profile_class)
17
+from oscar.core.utils import safe_referrer
18
+from oscar.views.generic import PostActionMixin
19
+
18
 from . import signals
20
 from . import signals
19
 
21
 
20
 PageTitleMixin, RegisterUserMixin = get_classes(
22
 PageTitleMixin, RegisterUserMixin = get_classes(

+ 3
- 3
src/oscar/apps/customer/wishlists/views.py 查看文件

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 from django.contrib import messages
2
 from django.contrib import messages
3
 from django.core.exceptions import (
3
 from django.core.exceptions import (
4
-    ObjectDoesNotExist, MultipleObjectsReturned, PermissionDenied)
4
+    MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied)
5
 from django.core.urlresolvers import reverse
5
 from django.core.urlresolvers import reverse
6
 from django.http import Http404
6
 from django.http import Http404
7
 from django.shortcuts import get_object_or_404, redirect
7
 from django.shortcuts import get_object_or_404, redirect
8
-from django.views.generic import (ListView, CreateView, UpdateView, DeleteView,
9
-                                  View, FormView)
10
 from django.utils.translation import ugettext_lazy as _
8
 from django.utils.translation import ugettext_lazy as _
9
+from django.views.generic import (
10
+    CreateView, DeleteView, FormView, ListView, UpdateView, View)
11
 
11
 
12
 from oscar.core.loading import get_class, get_classes, get_model
12
 from oscar.core.loading import get_class, get_classes, get_model
13
 from oscar.core.utils import redirect_to_referrer, safe_referrer
13
 from oscar.core.utils import redirect_to_referrer, safe_referrer

+ 1
- 1
src/oscar/apps/dashboard/app.py 查看文件

1
-from django.conf.urls import url, include
1
+from django.conf.urls import include, url
2
 
2
 
3
 from oscar.core.application import Application
3
 from oscar.core.application import Application
4
 from oscar.core.loading import get_class
4
 from oscar.core.loading import get_class

+ 3
- 3
src/oscar/apps/dashboard/catalogue/tables.py 查看文件

1
 from django.utils.safestring import mark_safe
1
 from django.utils.safestring import mark_safe
2
-from django.utils.translation import ugettext_lazy as _, ungettext_lazy
3
-
4
-from django_tables2 import Column, LinkColumn, TemplateColumn, A
2
+from django.utils.translation import ugettext_lazy as _
3
+from django.utils.translation import ungettext_lazy
4
+from django_tables2 import A, Column, LinkColumn, TemplateColumn
5
 
5
 
6
 from oscar.core.loading import get_class, get_model
6
 from oscar.core.loading import get_class, get_model
7
 
7
 

+ 6
- 8
src/oscar/apps/dashboard/catalogue/views.py 查看文件

1
-from django.views import generic
2
-from django.db.models import Q
3
-from django.http import HttpResponseRedirect
1
+from django.conf import settings
4
 from django.contrib import messages
2
 from django.contrib import messages
5
 from django.core.urlresolvers import reverse
3
 from django.core.urlresolvers import reverse
6
-from django.utils.translation import ugettext_lazy as _
4
+from django.db.models import Q
5
+from django.http import HttpResponseRedirect
7
 from django.shortcuts import get_object_or_404, redirect
6
 from django.shortcuts import get_object_or_404, redirect
8
 from django.template.loader import render_to_string
7
 from django.template.loader import render_to_string
9
-from django.conf import settings
10
-
11
-from oscar.core.loading import get_classes, get_model
12
-
8
+from django.utils.translation import ugettext_lazy as _
9
+from django.views import generic
13
 from django_tables2 import SingleTableMixin
10
 from django_tables2 import SingleTableMixin
14
 
11
 
12
+from oscar.core.loading import get_classes, get_model
15
 from oscar.views.generic import ObjectLookupView
13
 from oscar.views.generic import ObjectLookupView
16
 
14
 
17
 (ProductForm,
15
 (ProductForm,

+ 1
- 1
src/oscar/apps/dashboard/catalogue/widgets.py 查看文件

1
 from django.core.urlresolvers import reverse_lazy
1
 from django.core.urlresolvers import reverse_lazy
2
 
2
 
3
-from oscar.forms.widgets import RemoteSelect, MultipleRemoteSelect
3
+from oscar.forms.widgets import MultipleRemoteSelect, RemoteSelect
4
 
4
 
5
 
5
 
6
 class ProductSelect(RemoteSelect):
6
 class ProductSelect(RemoteSelect):

+ 3
- 3
src/oscar/apps/dashboard/communications/forms.py 查看文件

1
-from django.utils import six
2
-
3
 from django import forms
1
 from django import forms
4
-from oscar.core.loading import get_model
5
 from django.template import Template, TemplateSyntaxError
2
 from django.template import Template, TemplateSyntaxError
3
+from django.utils import six
6
 from django.utils.translation import ugettext_lazy as _
4
 from django.utils.translation import ugettext_lazy as _
5
+
7
 from oscar.apps.customer.utils import normalise_email
6
 from oscar.apps.customer.utils import normalise_email
7
+from oscar.core.loading import get_model
8
 
8
 
9
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
9
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
10
 Order = get_model('order', 'Order')
10
 Order = get_model('order', 'Order')

+ 2
- 4
src/oscar/apps/dashboard/communications/views.py 查看文件

1
-from django.utils import six
2
-
3
 from django.contrib import messages
1
 from django.contrib import messages
4
 from django.contrib.sites.models import get_current_site
2
 from django.contrib.sites.models import get_current_site
5
-from oscar.core.loading import get_model
6
 from django.template import TemplateSyntaxError
3
 from django.template import TemplateSyntaxError
4
+from django.utils import six
7
 from django.utils.translation import ugettext_lazy as _
5
 from django.utils.translation import ugettext_lazy as _
8
 from django.views import generic
6
 from django.views import generic
9
 
7
 
10
-from oscar.core.loading import get_class
8
+from oscar.core.loading import get_class, get_model
11
 
9
 
12
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
10
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
13
 CommunicationEventTypeForm = get_class('dashboard.communications.forms',
11
 CommunicationEventTypeForm = get_class('dashboard.communications.forms',

+ 0
- 1
src/oscar/apps/dashboard/menu.py 查看文件

4
 
4
 
5
 from oscar.core.loading import get_class
5
 from oscar.core.loading import get_class
6
 
6
 
7
-
8
 Node = get_class('dashboard.nav', 'Node')
7
 Node = get_class('dashboard.nav', 'Node')
9
 
8
 
10
 
9
 

+ 4
- 2
src/oscar/apps/dashboard/nav.py 查看文件

1
 import re
1
 import re
2
-from django.core.urlresolvers import reverse, resolve, NoReverseMatch
2
+
3
 from django.core.exceptions import ImproperlyConfigured
3
 from django.core.exceptions import ImproperlyConfigured
4
+from django.core.urlresolvers import NoReverseMatch, resolve, reverse
4
 from django.http import Http404
5
 from django.http import Http404
5
-from oscar.core.loading import get_class, AppNotFoundError
6
+
7
+from oscar.core.loading import AppNotFoundError, get_class
6
 from oscar.views.decorators import check_permissions
8
 from oscar.views.decorators import check_permissions
7
 
9
 
8
 
10
 

+ 1
- 1
src/oscar/apps/dashboard/offers/app.py 查看文件

1
 from django.conf.urls import url
1
 from django.conf.urls import url
2
 
2
 
3
-from oscar.core.loading import get_class
4
 from oscar.core.application import Application
3
 from oscar.core.application import Application
4
+from oscar.core.loading import get_class
5
 
5
 
6
 
6
 
7
 class OffersDashboardApplication(Application):
7
 class OffersDashboardApplication(Application):

+ 1
- 1
src/oscar/apps/dashboard/offers/forms.py 查看文件

1
 import datetime
1
 import datetime
2
-from django.utils import six
3
 
2
 
4
 from django import forms
3
 from django import forms
4
+from django.utils import six
5
 from django.utils.translation import ugettext_lazy as _
5
 from django.utils.translation import ugettext_lazy as _
6
 
6
 
7
 from oscar.core.loading import get_model
7
 from oscar.core.loading import get_model

+ 1
- 0
src/oscar/apps/dashboard/offers/reports.py 查看文件

1
 from django.utils.translation import ugettext_lazy as _
1
 from django.utils.translation import ugettext_lazy as _
2
 
2
 
3
 from oscar.core.loading import get_class
3
 from oscar.core.loading import get_class
4
+
4
 ReportCSVFormatter = get_class(
5
 ReportCSVFormatter = get_class(
5
     'dashboard.reports.reports', 'ReportCSVFormatter')
6
     'dashboard.reports.reports', 'ReportCSVFormatter')
6
 
7
 

+ 5
- 5
src/oscar/apps/dashboard/offers/views.py 查看文件

1
 import datetime
1
 import datetime
2
 import json
2
 import json
3
 
3
 
4
-from django.views.generic import ListView, FormView, DeleteView
5
-from django.core.urlresolvers import reverse
6
 from django.contrib import messages
4
 from django.contrib import messages
5
+from django.core import serializers
6
+from django.core.serializers.json import DjangoJSONEncoder
7
+from django.core.urlresolvers import reverse
7
 from django.http import HttpResponseRedirect
8
 from django.http import HttpResponseRedirect
8
 from django.shortcuts import get_object_or_404
9
 from django.shortcuts import get_object_or_404
9
 from django.utils.translation import ugettext_lazy as _
10
 from django.utils.translation import ugettext_lazy as _
10
-from django.core import serializers
11
-from django.core.serializers.json import DjangoJSONEncoder
11
+from django.views.generic import DeleteView, FormView, ListView
12
 
12
 
13
-from oscar.core.loading import get_classes, get_class, get_model
13
+from oscar.core.loading import get_class, get_classes, get_model
14
 from oscar.views import sort_queryset
14
 from oscar.views import sort_queryset
15
 
15
 
16
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
16
 ConditionalOffer = get_model('offer', 'ConditionalOffer')

+ 12
- 11
src/oscar/apps/dashboard/orders/views.py 查看文件

1
 import datetime
1
 import datetime
2
-from decimal import Decimal as D, InvalidOperation
2
+from decimal import Decimal as D
3
+from decimal import InvalidOperation
3
 
4
 
5
+from django.conf import settings
4
 from django.contrib import messages
6
 from django.contrib import messages
5
-from django.utils.translation import ugettext_lazy as _
6
-from django.core.urlresolvers import reverse
7
 from django.core.exceptions import ObjectDoesNotExist
7
 from django.core.exceptions import ObjectDoesNotExist
8
-from django.db.models import fields, Q, Sum, Count
9
-from django.http import HttpResponse, HttpResponseRedirect, Http404
8
+from django.core.urlresolvers import reverse
9
+from django.db.models import Q, Count, Sum, fields
10
+from django.http import Http404, HttpResponse, HttpResponseRedirect
10
 from django.shortcuts import get_object_or_404, redirect
11
 from django.shortcuts import get_object_or_404, redirect
11
 from django.utils.datastructures import SortedDict
12
 from django.utils.datastructures import SortedDict
12
-from django.views.generic import ListView, DetailView, UpdateView, FormView
13
-from django.conf import settings
13
+from django.utils.translation import ugettext_lazy as _
14
+from django.views.generic import DetailView, FormView, ListView, UpdateView
14
 
15
 
15
-from oscar.core.loading import get_class, get_model
16
-from oscar.core.utils import format_datetime, datetime_combine
16
+from oscar.apps.order import exceptions as order_exceptions
17
+from oscar.apps.payment.exceptions import PaymentError
17
 from oscar.core.compat import UnicodeCSVWriter
18
 from oscar.core.compat import UnicodeCSVWriter
19
+from oscar.core.loading import get_class, get_model
20
+from oscar.core.utils import datetime_combine, format_datetime
18
 from oscar.views import sort_queryset
21
 from oscar.views import sort_queryset
19
 from oscar.views.generic import BulkEditMixin
22
 from oscar.views.generic import BulkEditMixin
20
-from oscar.apps.payment.exceptions import PaymentError
21
-from oscar.apps.order import exceptions as order_exceptions
22
 
23
 
23
 Partner = get_model('partner', 'Partner')
24
 Partner = get_model('partner', 'Partner')
24
 Transaction = get_model('payment', 'Transaction')
25
 Transaction = get_model('payment', 'Transaction')

+ 3
- 1
src/oscar/apps/dashboard/pages/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
+from django.utils.translation import ugettext_lazy as _
3
+from django.utils.translation import pgettext_lazy
4
+
2
 from oscar.core.loading import get_model
5
 from oscar.core.loading import get_model
3
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
4
 from oscar.core.validators import URLDoesNotExistValidator
6
 from oscar.core.validators import URLDoesNotExistValidator
5
 
7
 
6
 FlatPage = get_model('flatpages', 'FlatPage')
8
 FlatPage = get_model('flatpages', 'FlatPage')

+ 2
- 3
src/oscar/apps/dashboard/pages/views.py 查看文件

1
+from django.conf import settings
1
 from django.contrib import messages
2
 from django.contrib import messages
2
 from django.core.exceptions import ValidationError
3
 from django.core.exceptions import ValidationError
3
 from django.core.urlresolvers import reverse
4
 from django.core.urlresolvers import reverse
6
 from django.utils.translation import ugettext_lazy as _
7
 from django.utils.translation import ugettext_lazy as _
7
 from django.views import generic
8
 from django.views import generic
8
 from django.views.generic import ListView
9
 from django.views.generic import ListView
9
-from django.conf import settings
10
 
10
 
11
+from oscar.apps.dashboard.pages import forms
11
 from oscar.core.loading import get_model
12
 from oscar.core.loading import get_model
12
 from oscar.core.utils import slugify
13
 from oscar.core.utils import slugify
13
 from oscar.core.validators import URLDoesNotExistValidator
14
 from oscar.core.validators import URLDoesNotExistValidator
14
-from oscar.apps.dashboard.pages import forms
15
-
16
 
15
 
17
 FlatPage = get_model('flatpages', 'FlatPage')
16
 FlatPage = get_model('flatpages', 'FlatPage')
18
 Site = get_model('sites', 'Site')
17
 Site = get_model('sites', 'Site')

+ 4
- 3
src/oscar/apps/dashboard/partners/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
 from django.contrib.auth.models import Permission
2
 from django.contrib.auth.models import Permission
3
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
3
+from django.utils.translation import ugettext_lazy as _
4
+from django.utils.translation import pgettext_lazy
4
 
5
 
5
-from oscar.core.loading import get_model
6
-from oscar.core.compat import existing_user_fields, get_user_model
7
 from oscar.apps.customer.forms import EmailUserCreationForm
6
 from oscar.apps.customer.forms import EmailUserCreationForm
7
+from oscar.core.compat import existing_user_fields, get_user_model
8
+from oscar.core.loading import get_model
8
 from oscar.core.validators import password_validators
9
 from oscar.core.validators import password_validators
9
 
10
 
10
 User = get_user_model()
11
 User = get_user_model()

+ 3
- 3
src/oscar/apps/dashboard/partners/views.py 查看文件

1
 from django.contrib import messages
1
 from django.contrib import messages
2
 from django.contrib.auth.models import Permission
2
 from django.contrib.auth.models import Permission
3
-from django.core.urlresolvers import reverse_lazy, reverse
3
+from django.core.urlresolvers import reverse, reverse_lazy
4
 from django.shortcuts import get_object_or_404, redirect
4
 from django.shortcuts import get_object_or_404, redirect
5
-from django.utils.translation import ugettext_lazy as _
6
 from django.template.loader import render_to_string
5
 from django.template.loader import render_to_string
6
+from django.utils.translation import ugettext_lazy as _
7
 from django.views import generic
7
 from django.views import generic
8
 
8
 
9
 from oscar.apps.customer.utils import normalise_email
9
 from oscar.apps.customer.utils import normalise_email
10
-from oscar.core.loading import get_classes, get_model
11
 from oscar.core.compat import get_user_model
10
 from oscar.core.compat import get_user_model
11
+from oscar.core.loading import get_classes, get_model
12
 from oscar.views import sort_queryset
12
 from oscar.views import sort_queryset
13
 
13
 
14
 User = get_user_model()
14
 User = get_user_model()

+ 1
- 1
src/oscar/apps/dashboard/promotions/app.py 查看文件

1
 from django.conf.urls import url
1
 from django.conf.urls import url
2
 
2
 
3
+from oscar.apps.promotions.conf import PROMOTION_CLASSES
3
 from oscar.core.application import Application
4
 from oscar.core.application import Application
4
 from oscar.core.loading import get_class
5
 from oscar.core.loading import get_class
5
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
6
 
6
 
7
 
7
 
8
 class PromotionsDashboardApplication(Application):
8
 class PromotionsDashboardApplication(Application):

+ 2
- 2
src/oscar/apps/dashboard/promotions/forms.py 查看文件

2
 from django.conf import settings
2
 from django.conf import settings
3
 from django.forms.models import inlineformset_factory
3
 from django.forms.models import inlineformset_factory
4
 from django.utils.translation import ugettext_lazy as _
4
 from django.utils.translation import ugettext_lazy as _
5
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
6
 
5
 
6
+from oscar.apps.promotions.conf import PROMOTION_CLASSES
7
+from oscar.core.loading import get_class, get_classes
7
 from oscar.forms.fields import ExtendedURLField
8
 from oscar.forms.fields import ExtendedURLField
8
-from oscar.core.loading import get_classes, get_class
9
 
9
 
10
 HandPickedProductList, RawHTML, SingleProduct, PagePromotion, OrderedProduct \
10
 HandPickedProductList, RawHTML, SingleProduct, PagePromotion, OrderedProduct \
11
     = get_classes('promotions.models',
11
     = get_classes('promotions.models',

+ 6
- 6
src/oscar/apps/dashboard/promotions/views.py 查看文件

1
 import itertools
1
 import itertools
2
 
2
 
3
-from django.views import generic
4
-from django.contrib.contenttypes.models import ContentType
5
-from django.utils.translation import ugettext_lazy as _
6
-from django.core.urlresolvers import reverse
7
 from django.conf import settings
3
 from django.conf import settings
8
 from django.contrib import messages
4
 from django.contrib import messages
9
-from django.http import HttpResponseRedirect
5
+from django.contrib.contenttypes.models import ContentType
6
+from django.core.urlresolvers import reverse
10
 from django.db.models import Count
7
 from django.db.models import Count
8
+from django.http import HttpResponseRedirect
11
 from django.shortcuts import HttpResponse
9
 from django.shortcuts import HttpResponse
10
+from django.utils.translation import ugettext_lazy as _
11
+from django.views import generic
12
 
12
 
13
-from oscar.core.loading import get_classes
14
 from oscar.apps.promotions.conf import PROMOTION_CLASSES
13
 from oscar.apps.promotions.conf import PROMOTION_CLASSES
14
+from oscar.core.loading import get_classes
15
 
15
 
16
 SingleProduct, RawHTML, Image, MultiImage, AutomaticProductList, \
16
 SingleProduct, RawHTML, Image, MultiImage, AutomaticProductList, \
17
     PagePromotion, HandPickedProductList \
17
     PagePromotion, HandPickedProductList \

+ 5
- 5
src/oscar/apps/dashboard/ranges/views.py 查看文件

5
 from django.core import exceptions
5
 from django.core import exceptions
6
 from django.core.urlresolvers import reverse
6
 from django.core.urlresolvers import reverse
7
 from django.http import HttpResponseRedirect
7
 from django.http import HttpResponseRedirect
8
-from django.shortcuts import get_object_or_404, HttpResponse
8
+from django.shortcuts import HttpResponse, get_object_or_404
9
 from django.template.loader import render_to_string
9
 from django.template.loader import render_to_string
10
-from django.utils.translation import ungettext, ugettext_lazy as _
10
+from django.utils.translation import ugettext_lazy as _
11
+from django.utils.translation import ungettext
11
 from django.views.generic import (
12
 from django.views.generic import (
12
-    ListView, DeleteView, CreateView, UpdateView, View)
13
+    CreateView, DeleteView, ListView, UpdateView, View)
13
 
14
 
14
-
15
-from oscar.views.generic import BulkEditMixin
16
 from oscar.core.loading import get_classes, get_model
15
 from oscar.core.loading import get_classes, get_model
16
+from oscar.views.generic import BulkEditMixin
17
 
17
 
18
 Range = get_model('offer', 'Range')
18
 Range = get_model('offer', 'Range')
19
 RangeProduct = get_model('offer', 'RangeProduct')
19
 RangeProduct = get_model('offer', 'RangeProduct')

+ 1
- 0
src/oscar/apps/dashboard/reports/forms.py 查看文件

2
 from django.utils.translation import ugettext_lazy as _
2
 from django.utils.translation import ugettext_lazy as _
3
 
3
 
4
 from oscar.core.loading import get_class
4
 from oscar.core.loading import get_class
5
+
5
 GeneratorRepository = get_class('dashboard.reports.utils',
6
 GeneratorRepository = get_class('dashboard.reports.utils',
6
                                 'GeneratorRepository')
7
                                 'GeneratorRepository')
7
 
8
 

+ 1
- 1
src/oscar/apps/dashboard/reports/reports.py 查看文件

1
 from datetime import datetime, time
1
 from datetime import datetime, time
2
 
2
 
3
 from django.http import HttpResponse
3
 from django.http import HttpResponse
4
-from django.utils.translation import ugettext_lazy as _
5
 from django.utils import timezone
4
 from django.utils import timezone
5
+from django.utils.translation import ugettext_lazy as _
6
 
6
 
7
 from oscar.core import utils
7
 from oscar.core import utils
8
 from oscar.core.compat import UnicodeCSVWriter
8
 from oscar.core.compat import UnicodeCSVWriter

+ 1
- 0
src/oscar/apps/dashboard/reports/utils.py 查看文件

1
 from oscar.core.loading import get_class, get_classes
1
 from oscar.core.loading import get_class, get_classes
2
+
2
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
3
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
3
 ProductReportGenerator, UserReportGenerator \
4
 ProductReportGenerator, UserReportGenerator \
4
     = get_classes('analytics.reports', ['ProductReportGenerator',
5
     = get_classes('analytics.reports', ['ProductReportGenerator',

+ 4
- 3
src/oscar/apps/dashboard/reports/views.py 查看文件

1
-from django.http import HttpResponseForbidden, Http404
1
+from django.conf import settings
2
+from django.http import Http404, HttpResponseForbidden
2
 from django.template.response import TemplateResponse
3
 from django.template.response import TemplateResponse
3
-from django.views.generic import ListView
4
 from django.utils.translation import ugettext_lazy as _
4
 from django.utils.translation import ugettext_lazy as _
5
-from django.conf import settings
5
+from django.views.generic import ListView
6
 
6
 
7
 from oscar.core.loading import get_class
7
 from oscar.core.loading import get_class
8
+
8
 ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
9
 ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
9
 GeneratorRepository = get_class('dashboard.reports.utils',
10
 GeneratorRepository = get_class('dashboard.reports.utils',
10
                                 'GeneratorRepository')
11
                                 'GeneratorRepository')

+ 2
- 1
src/oscar/apps/dashboard/reviews/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
-from oscar.core.loading import get_model
3
 from django.utils.translation import ugettext_lazy as _
2
 from django.utils.translation import ugettext_lazy as _
4
 
3
 
4
+from oscar.core.loading import get_model
5
+
5
 ProductReview = get_model('reviews', 'productreview')
6
 ProductReview = get_model('reviews', 'productreview')
6
 
7
 
7
 
8
 

+ 1
- 0
src/oscar/apps/dashboard/reviews/utils.py 查看文件

1
 from oscar.core.loading import get_class, get_classes
1
 from oscar.core.loading import get_class, get_classes
2
+
2
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
3
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
3
 ProductReportGenerator, UserReportGenerator \
4
 ProductReportGenerator, UserReportGenerator \
4
     = get_classes('analytics.reports', ['ProductReportGenerator',
5
     = get_classes('analytics.reports', ['ProductReportGenerator',

+ 5
- 5
src/oscar/apps/dashboard/reviews/views.py 查看文件

1
 import datetime
1
 import datetime
2
 
2
 
3
-from django.views import generic
4
 from django.conf import settings
3
 from django.conf import settings
5
-from django.db.models import Q
6
-from django.utils.translation import ugettext_lazy as _
7
 from django.core.urlresolvers import reverse
4
 from django.core.urlresolvers import reverse
5
+from django.db.models import Q
8
 from django.http import HttpResponseRedirect
6
 from django.http import HttpResponseRedirect
7
+from django.utils.translation import ugettext_lazy as _
8
+from django.views import generic
9
 
9
 
10
-from oscar.views.generic import BulkEditMixin
11
 from oscar.apps.dashboard.reviews import forms
10
 from oscar.apps.dashboard.reviews import forms
12
-from oscar.core.utils import format_datetime
13
 from oscar.core.loading import get_model
11
 from oscar.core.loading import get_model
12
+from oscar.core.utils import format_datetime
14
 from oscar.views import sort_queryset
13
 from oscar.views import sort_queryset
14
+from oscar.views.generic import BulkEditMixin
15
 
15
 
16
 ProductReview = get_model('reviews', 'productreview')
16
 ProductReview = get_model('reviews', 'productreview')
17
 
17
 

+ 1
- 1
src/oscar/apps/dashboard/shipping/views.py 查看文件

4
 from django.template.loader import render_to_string
4
 from django.template.loader import render_to_string
5
 from django.views import generic
5
 from django.views import generic
6
 
6
 
7
-from oscar.core.loading import get_model, get_classes
7
+from oscar.core.loading import get_classes, get_model
8
 
8
 
9
 WeightBandForm, WeightBasedForm = get_classes(
9
 WeightBandForm, WeightBasedForm = get_classes(
10
     'dashboard.shipping.forms', ['WeightBandForm', 'WeightBasedForm'])
10
     'dashboard.shipping.forms', ['WeightBandForm', 'WeightBasedForm'])

+ 0
- 1
src/oscar/apps/dashboard/tables.py 查看文件

1
 from django.utils.translation import ungettext_lazy
1
 from django.utils.translation import ungettext_lazy
2
-
3
 from django_tables2 import Table
2
 from django_tables2 import Table
4
 
3
 
5
 
4
 

+ 3
- 2
src/oscar/apps/dashboard/users/forms.py 查看文件

1
 from django import forms
1
 from django import forms
2
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
2
+from django.utils.translation import ugettext_lazy as _
3
+from django.utils.translation import pgettext_lazy
3
 
4
 
4
-from oscar.core.loading import get_model
5
 from oscar.core.compat import get_user_model
5
 from oscar.core.compat import get_user_model
6
+from oscar.core.loading import get_model
6
 
7
 
7
 User = get_user_model()
8
 User = get_user_model()
8
 ProductAlert = get_model('customer', 'ProductAlert')
9
 ProductAlert = get_model('customer', 'ProductAlert')

+ 1
- 1
src/oscar/apps/dashboard/users/tables.py 查看文件

1
-from django_tables2 import LinkColumn, TemplateColumn, Column, A
1
+from django_tables2 import A, Column, LinkColumn, TemplateColumn
2
 
2
 
3
 from oscar.core.loading import get_class
3
 from oscar.core.loading import get_class
4
 
4
 

+ 5
- 6
src/oscar/apps/dashboard/users/views.py 查看文件

1
-from django.db.models import Q
2
 from django.conf import settings
1
 from django.conf import settings
3
 from django.contrib import messages
2
 from django.contrib import messages
3
+from django.core.urlresolvers import reverse
4
+from django.db.models import Q
4
 from django.shortcuts import redirect
5
 from django.shortcuts import redirect
5
 from django.utils.translation import ugettext_lazy as _
6
 from django.utils.translation import ugettext_lazy as _
6
-from django.core.urlresolvers import reverse
7
-from django.views.generic import ListView, DetailView, DeleteView, \
8
-    UpdateView, FormView, TemplateView
7
+from django.views.generic import (
8
+    DeleteView, DetailView, FormView, ListView, TemplateView, UpdateView)
9
 from django.views.generic.detail import SingleObjectMixin
9
 from django.views.generic.detail import SingleObjectMixin
10
 from django.views.generic.edit import FormMixin
10
 from django.views.generic.edit import FormMixin
11
-
12
 from django_tables2 import SingleTableMixin
11
 from django_tables2 import SingleTableMixin
13
 
12
 
14
 from oscar.apps.customer.utils import normalise_email
13
 from oscar.apps.customer.utils import normalise_email
15
-from oscar.views.generic import BulkEditMixin
16
 from oscar.core.compat import get_user_model
14
 from oscar.core.compat import get_user_model
17
 from oscar.core.loading import get_class, get_classes, get_model
15
 from oscar.core.loading import get_class, get_classes, get_model
16
+from oscar.views.generic import BulkEditMixin
18
 
17
 
19
 UserSearchForm, ProductAlertSearchForm, ProductAlertUpdateForm = get_classes(
18
 UserSearchForm, ProductAlertSearchForm, ProductAlertUpdateForm = get_classes(
20
     'dashboard.users.forms', ('UserSearchForm', 'ProductAlertSearchForm',
19
     'dashboard.users.forms', ('UserSearchForm', 'ProductAlertSearchForm',

+ 5
- 4
src/oscar/apps/dashboard/views.py 查看文件

1
 from datetime import timedelta
1
 from datetime import timedelta
2
-from decimal import Decimal as D, ROUND_UP
2
+from decimal import Decimal as D
3
+from decimal import ROUND_UP
3
 
4
 
5
+from django.db.models import Avg, Count, Sum
4
 from django.utils.timezone import now
6
 from django.utils.timezone import now
5
 from django.views.generic import TemplateView
7
 from django.views.generic import TemplateView
6
-from oscar.core.loading import get_model
7
-from django.db.models import Avg, Sum, Count
8
 
8
 
9
-from oscar.core.compat import get_user_model
10
 from oscar.apps.promotions.models import AbstractPromotion
9
 from oscar.apps.promotions.models import AbstractPromotion
10
+from oscar.core.compat import get_user_model
11
+from oscar.core.loading import get_model
11
 
12
 
12
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
13
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
13
 Voucher = get_model('voucher', 'Voucher')
14
 Voucher = get_model('voucher', 'Voucher')

+ 1
- 3
src/oscar/apps/dashboard/vouchers/views.py 查看文件

1
-import datetime
2
-
3
 from django.conf import settings
1
 from django.conf import settings
4
 from django.contrib import messages
2
 from django.contrib import messages
5
 from django.core.urlresolvers import reverse
3
 from django.core.urlresolvers import reverse
8
 from django.utils.translation import ugettext_lazy as _
6
 from django.utils.translation import ugettext_lazy as _
9
 from django.views import generic
7
 from django.views import generic
10
 
8
 
11
-from oscar.core.loading import get_model, get_class
9
+from oscar.core.loading import get_class, get_model
12
 from oscar.views import sort_queryset
10
 from oscar.views import sort_queryset
13
 
11
 
14
 VoucherForm = get_class('dashboard.vouchers.forms', 'VoucherForm')
12
 VoucherForm = get_class('dashboard.vouchers.forms', 'VoucherForm')

+ 8
- 8
src/oscar/apps/offer/abstract_models.py 查看文件

1
 import itertools
1
 import itertools
2
-import os
3
 import operator
2
 import operator
3
+import os
4
 import re
4
 import re
5
-from decimal import Decimal as D, ROUND_DOWN
5
+from decimal import Decimal as D
6
+from decimal import ROUND_DOWN
6
 
7
 
7
-from django.db import models
8
-from django.db.models.query import Q
8
+from django.conf import settings
9
 from django.core import exceptions
9
 from django.core import exceptions
10
 from django.core.urlresolvers import reverse
10
 from django.core.urlresolvers import reverse
11
+from django.db import models
12
+from django.db.models.query import Q
11
 from django.template.defaultfilters import date as date_filter
13
 from django.template.defaultfilters import date as date_filter
12
 from django.utils.encoding import python_2_unicode_compatible
14
 from django.utils.encoding import python_2_unicode_compatible
13
 from django.utils.functional import cached_property
15
 from django.utils.functional import cached_property
14
-from django.utils.timezone import now, get_current_timezone
16
+from django.utils.timezone import get_current_timezone, now
15
 from django.utils.translation import ugettext_lazy as _
17
 from django.utils.translation import ugettext_lazy as _
16
-from django.conf import settings
17
 
18
 
18
 from oscar.apps.offer import results, utils
19
 from oscar.apps.offer import results, utils
19
 from oscar.apps.offer.managers import ActiveOfferManager
20
 from oscar.apps.offer.managers import ActiveOfferManager
20
 from oscar.core.compat import AUTH_USER_MODEL
21
 from oscar.core.compat import AUTH_USER_MODEL
21
-from oscar.core.loading import get_model, get_class
22
+from oscar.core.loading import get_class, get_model
22
 from oscar.models import fields
23
 from oscar.models import fields
23
 from oscar.templatetags.currency_filters import currency
24
 from oscar.templatetags.currency_filters import currency
24
 
25
 
25
-
26
 BrowsableRangeManager = get_class('offer.managers', 'BrowsableRangeManager')
26
 BrowsableRangeManager = get_class('offer.managers', 'BrowsableRangeManager')
27
 
27
 
28
 
28
 

+ 1
- 0
src/oscar/apps/offer/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
5
 ConditionalOffer = get_model('offer', 'ConditionalOffer')

+ 2
- 2
src/oscar/apps/offer/applicator.py 查看文件

1
-from itertools import chain
2
 import logging
1
 import logging
2
+from itertools import chain
3
 
3
 
4
 from django.db.models import Q
4
 from django.db.models import Q
5
 from django.utils.timezone import now
5
 from django.utils.timezone import now
6
 
6
 
7
-from oscar.core.loading import get_model
8
 from oscar.apps.offer import results
7
 from oscar.apps.offer import results
8
+from oscar.core.loading import get_model
9
 
9
 
10
 logger = logging.getLogger('oscar.offers')
10
 logger = logging.getLogger('oscar.offers')
11
 
11
 

+ 1
- 1
src/oscar/apps/offer/benefits.py 查看文件

1
 from decimal import Decimal as D
1
 from decimal import Decimal as D
2
+
2
 from django.utils.translation import ugettext_lazy as _
3
 from django.utils.translation import ugettext_lazy as _
3
 
4
 
4
 from oscar.apps.offer import conditions, results, utils
5
 from oscar.apps.offer import conditions, results, utils
5
 from oscar.core.loading import get_model
6
 from oscar.core.loading import get_model
6
 from oscar.templatetags.currency_filters import currency
7
 from oscar.templatetags.currency_filters import currency
7
 
8
 
8
-
9
 Benefit = get_model('offer', 'Benefit')
9
 Benefit = get_model('offer', 'Benefit')
10
 
10
 
11
 __all__ = [
11
 __all__ = [

+ 4
- 3
src/oscar/apps/offer/conditions.py 查看文件

1
-from decimal import Decimal as D, ROUND_UP
1
+from decimal import Decimal as D
2
+from decimal import ROUND_UP
2
 
3
 
3
 from django.utils import six
4
 from django.utils import six
4
-from django.utils.translation import ungettext, ugettext_lazy as _
5
+from django.utils.translation import ugettext_lazy as _
6
+from django.utils.translation import ungettext
5
 
7
 
6
 from oscar.apps.offer import utils
8
 from oscar.apps.offer import utils
7
 from oscar.core.loading import get_model
9
 from oscar.core.loading import get_model
8
 from oscar.templatetags.currency_filters import currency
10
 from oscar.templatetags.currency_filters import currency
9
 
11
 
10
-
11
 Condition = get_model('offer', 'Condition')
12
 Condition = get_model('offer', 'Condition')
12
 
13
 
13
 __all__ = [
14
 __all__ = [

+ 1
- 1
src/oscar/apps/offer/custom.py 查看文件

1
 from django.core import exceptions
1
 from django.core import exceptions
2
 from django.db import IntegrityError
2
 from django.db import IntegrityError
3
 
3
 
4
-from oscar.apps.offer.models import Condition, Benefit
4
+from oscar.apps.offer.models import Benefit, Condition
5
 from oscar.core.loading import get_model
5
 from oscar.core.loading import get_model
6
 
6
 
7
 Range = get_model('offer', 'Range')
7
 Range = get_model('offer', 'Range')

+ 1
- 1
src/oscar/apps/offer/managers.py 查看文件

1
-from django.utils.timezone import now
2
 from django.db import models
1
 from django.db import models
2
+from django.utils.timezone import now
3
 
3
 
4
 
4
 
5
 class ActiveOfferManager(models.Manager):
5
 class ActiveOfferManager(models.Manager):

+ 8
- 9
src/oscar/apps/offer/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
2
-from oscar.apps.offer.results import (
3
-    BasketDiscount, ShippingDiscount, PostOrderAction,
4
-    SHIPPING_DISCOUNT, ZERO_DISCOUNT)
5
 from oscar.apps.offer.abstract_models import (
1
 from oscar.apps.offer.abstract_models import (
6
     AbstractBenefit, AbstractCondition, AbstractConditionalOffer,
2
     AbstractBenefit, AbstractCondition, AbstractConditionalOffer,
7
     AbstractRange, AbstractRangeProduct, AbstractRangeProductFileUpload)
3
     AbstractRange, AbstractRangeProduct, AbstractRangeProductFileUpload)
8
-
4
+from oscar.apps.offer.results import (
5
+    SHIPPING_DISCOUNT, ZERO_DISCOUNT, BasketDiscount, PostOrderAction,
6
+    ShippingDiscount)
7
+from oscar.core.loading import is_model_registered
9
 
8
 
10
 __all__ = [
9
 __all__ = [
11
     'BasketDiscount', 'ShippingDiscount', 'PostOrderAction',
10
     'BasketDiscount', 'ShippingDiscount', 'PostOrderAction',
58
 # Import the benefits and the conditions. Required after initializing the
57
 # Import the benefits and the conditions. Required after initializing the
59
 # parent models to allow overriding them
58
 # parent models to allow overriding them
60
 
59
 
61
-from oscar.apps.offer.benefits import *  # noqa
62
-from oscar.apps.offer.conditions import *  # noqa
60
+from oscar.apps.offer.benefits import *  # noqa isort:skip
61
+from oscar.apps.offer.conditions import *  # noqa isort:skip
63
 
62
 
64
-from oscar.apps.offer.benefits import __all__ as benefit_classes  # noqa
65
-from oscar.apps.offer.conditions import __all__ as condition_classes  # noqa
63
+from oscar.apps.offer.benefits import __all__ as benefit_classes  # noqa isort:skip
64
+from oscar.apps.offer.conditions import __all__ as condition_classes  # noqa isort:skip
66
 
65
 
67
 __all__.extend(benefit_classes)
66
 __all__.extend(benefit_classes)
68
 __all__.extend(condition_classes)
67
 __all__.extend(condition_classes)

+ 1
- 2
src/oscar/apps/offer/reports.py 查看文件

3
 
3
 
4
 from django.utils.translation import ugettext_lazy as _
4
 from django.utils.translation import ugettext_lazy as _
5
 
5
 
6
-from oscar.core.loading import get_model, get_class
7
-
6
+from oscar.core.loading import get_class, get_model
8
 
7
 
9
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
8
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
10
 ReportCSVFormatter = get_class('dashboard.reports.reports',
9
 ReportCSVFormatter = get_class('dashboard.reports.reports',

+ 1
- 1
src/oscar/apps/offer/views.py 查看文件

1
-from django.views.generic import ListView
2
 from django import http
1
 from django import http
3
 from django.conf import settings
2
 from django.conf import settings
4
 from django.shortcuts import get_object_or_404
3
 from django.shortcuts import get_object_or_404
4
+from django.views.generic import ListView
5
 
5
 
6
 from oscar.core.loading import get_model
6
 from oscar.core.loading import get_model
7
 
7
 

+ 6
- 4
src/oscar/apps/order/abstract_models.py 查看文件

1
+import hashlib
1
 from collections import OrderedDict
2
 from collections import OrderedDict
2
 from decimal import Decimal as D
3
 from decimal import Decimal as D
3
-import hashlib
4
 
4
 
5
 from django.conf import settings
5
 from django.conf import settings
6
 from django.db import models
6
 from django.db import models
7
 from django.db.models import Sum
7
 from django.db.models import Sum
8
 from django.utils import timezone
8
 from django.utils import timezone
9
-from django.utils.encoding import python_2_unicode_compatible
10
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
11
 from django.utils.datastructures import SortedDict
9
 from django.utils.datastructures import SortedDict
10
+from django.utils.encoding import python_2_unicode_compatible
12
 from django.utils.timezone import now
11
 from django.utils.timezone import now
12
+from django.utils.translation import ugettext_lazy as _
13
+from django.utils.translation import pgettext_lazy
13
 
14
 
14
-from oscar.core.utils import get_default_currency
15
 from oscar.core.compat import AUTH_USER_MODEL
15
 from oscar.core.compat import AUTH_USER_MODEL
16
+from oscar.core.utils import get_default_currency
16
 from oscar.models.fields import AutoSlugField
17
 from oscar.models.fields import AutoSlugField
18
+
17
 from . import exceptions
19
 from . import exceptions
18
 
20
 
19
 
21
 

+ 1
- 0
src/oscar/apps/order/admin.py 查看文件

1
 from django.contrib import admin
1
 from django.contrib import admin
2
+
2
 from oscar.core.loading import get_model
3
 from oscar.core.loading import get_model
3
 
4
 
4
 Order = get_model('order', 'Order')
5
 Order = get_model('order', 'Order')

+ 3
- 3
src/oscar/apps/order/models.py 查看文件

1
-from oscar.core.loading import is_model_registered
1
+from oscar.apps.address.abstract_models import (
2
+    AbstractBillingAddress, AbstractShippingAddress)
2
 from oscar.apps.order.abstract_models import *  # noqa
3
 from oscar.apps.order.abstract_models import *  # noqa
3
-from oscar.apps.address.abstract_models import (AbstractShippingAddress,
4
-                                                AbstractBillingAddress)
4
+from oscar.core.loading import is_model_registered
5
 
5
 
6
 __all__ = ['PaymentEventQuantity', 'ShippingEventQuantity']
6
 __all__ = ['PaymentEventQuantity', 'ShippingEventQuantity']
7
 
7
 

+ 1
- 1
src/oscar/apps/order/processing.py 查看文件

2
 
2
 
3
 from django.utils.translation import ugettext_lazy as _
3
 from django.utils.translation import ugettext_lazy as _
4
 
4
 
5
-from oscar.core.loading import get_model
6
 from oscar.apps.order import exceptions
5
 from oscar.apps.order import exceptions
6
+from oscar.core.loading import get_model
7
 
7
 
8
 ShippingEventQuantity = get_model('order', 'ShippingEventQuantity')
8
 ShippingEventQuantity = get_model('order', 'ShippingEventQuantity')
9
 PaymentEventQuantity = get_model('order', 'PaymentEventQuantity')
9
 PaymentEventQuantity = get_model('order', 'PaymentEventQuantity')

+ 0
- 0
src/oscar/apps/order/reports.py 查看文件


部分文件因文件數量過多而無法顯示

Loading…
取消
儲存