Merge pull request #251 from bogdal/django-1.8

Django 1.8 support

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
 - 2.7
-- 3.2
 - 3.3
 - 3.4
 install:

saleor/core/utils/__init__.py

@@ -1,10 +1,10 @@
 # coding: utf-8
 from __future__ import unicode_literals
+import re
 
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.http.request import absolute_http_url_re
 from django.template.response import TemplateResponse
 from django.utils.encoding import iri_to_uri, smart_text
 from satchless.process import InvalidData, Step
@@ -16,6 +16,8 @@
 
 __all__ = ['BaseStep', 'CategoryChoiceField', 'build_absolute_uri']
 
+absolute_http_url_re = re.compile(r"^https?://", re.I)
+
 
 class CategoryChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, obj):

saleor/order/models.py

@@ -2,6 +2,7 @@
 from decimal import Decimal
 from uuid import uuid4
 
+import emailit.api
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.validators import MinValueValidator, MaxValueValidator
@@ -18,7 +19,6 @@
 from prices import Price
 from satchless.item import ItemSet, ItemLine
 
-from ..communication.mail import send_email
 from ..core.utils import build_absolute_uri
 from ..product.models import Product
 from ..userprofile.models import Address, User
@@ -121,7 +121,8 @@ def send_confirmation_email(self):
         payment_url = build_absolute_uri(
             reverse('order:details', kwargs={'token': self.token}))
         context = {'payment_url': payment_url}
-        send_email(email, 'order/emails/confirm_email.txt', context)
+
+        emailit.api.send_mail(email, context, 'order/emails/confirm_email')
 
     def get_last_payment_status(self):
         last_payment = self.payments.last()
@@ -344,7 +345,8 @@ def send_confirmation_email(self):
         order_url = build_absolute_uri(
             reverse('order:details', kwargs={'token': self.order.token}))
         context = {'order_url': order_url}
-        send_email(email, 'order/payment/emails/confirm_email.txt', context)
+        emailit.api.send_mail(
+            email, context, 'order/payment/emails/confirm_email')
 
     def get_purchased_items(self):
         items = [PurchasedItem(

saleor/order/templates/order/emails/confirm_email.txt → saleor/order/templates/order/emails/confirm_email.body.txt

@@ -1,8 +1,6 @@
 {% load i18n %}
 
-{% block subject %}{% trans "Order details" %}{% endblock %}
-
-{% block text %}{% blocktrans %}Hi!
+{% block content %}{% blocktrans %}Hi!
 
 Thank you for your order. To see your payment details please visit:
 {{ payment_url }}

saleor/order/templates/order/emails/confirm_email.subject.txt

@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Order details" %}

saleor/order/templates/order/payment/emails/confirm_email.txt → saleor/order/templates/order/payment/emails/confirm_email.body.txt

@@ -1,8 +1,6 @@
 {% load i18n %}
 
-{% block subject %}{% trans "Payment details" %}{% endblock %}
-
-{% block text %}{% blocktrans %}Hi!
+{% block content %}{% blocktrans %}Hi!
 
 Thank you for your payment. To see your payment details please visit:
 {{ order_url }}

saleor/order/templates/order/payment/emails/confirm_email.subject.txt

@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Payment details" %}

saleor/registration/forms.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import emailit.api
 from django import forms
 from django.contrib.auth import authenticate, get_user_model
 from django.contrib.auth.forms import AuthenticationForm, SetPasswordForm
@@ -12,7 +13,6 @@
     EmailChangeRequest,
     ExternalUserData)
 from .utils import get_client_class_for_service
-from ..communication.mail import send_email
 
 
 class LoginForm(AuthenticationForm):
@@ -48,7 +48,7 @@ class RequestEmailConfirmationForm(forms.Form):
 
     email = forms.EmailField()
 
-    template = 'registration/emails/confirm_email.txt'
+    template = 'registration/emails/confirm_email'
 
     def __init__(self, local_host=None, data=None):
         self.local_host = local_host
@@ -59,7 +59,7 @@ def send(self):
         request = self.create_request_instance()
         confirmation_url = self.local_host + request.get_confirmation_url()
         context = {'confirmation_url': confirmation_url}
-        send_email(email, self.template, context)
+        emailit.api.send_mail(email, context, self.template)
 
     def create_request_instance(self):
         email = self.cleaned_data['email']
@@ -70,7 +70,7 @@ def create_request_instance(self):
 
 class RequestEmailChangeForm(RequestEmailConfirmationForm):
 
-    template = 'registration/emails/change_email.txt'
+    template = 'registration/emails/change_email'
 
     def __init__(self, user=None, *args, **kwargs):
         self.user = user

saleor/registration/templates/registration/emails/change_email.txt → saleor/registration/templates/registration/emails/change_email.body.txt

@@ -1,8 +1,6 @@
 {% load i18n %}
 
-{% block subject %}{% trans "Confirm your email address" %}{% endblock %}
-
-{% block text %}{% blocktrans %}Hi!
+{% block content %}{% blocktrans %}Hi!
 
 You have requested email change in saleor project. To continue visit the link below.
 

saleor/registration/templates/registration/emails/change_email.subject.txt

@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Confirm your email address" %}

saleor/registration/templates/registration/emails/confirm_email.txt → saleor/registration/templates/registration/emails/confirm_email.body.txt

@@ -1,8 +1,6 @@
 {% load i18n %}
 
-{% block subject %}{% trans "Confirm your email address" %}{% endblock %}
-
-{% block text %}{% blocktrans %}Hi!
+{% block content %}{% blocktrans %}Hi!
 
 You have requested login access to saleor project. To continue visit the link below.
 

saleor/registration/templates/registration/emails/confirm_email.subject.txt

@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Confirm your email address" %}

saleor/settings.py

@@ -104,6 +104,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.sitemaps',
+    'django.contrib.sites',
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.auth',
@@ -123,6 +124,7 @@
     'babeldjango',
     'django_images',
     'django_prices',
+    'emailit',
     'mptt',
     'payments',
     'selectable'

saleor/tests.py

@@ -8,7 +8,6 @@
 TEST_MODULES = [
     'saleor.cart.tests',
     'saleor.checkout.tests',
-    'saleor.communication.tests',
     'saleor.core.tests',
     #'saleor.delivery.tests',
     'saleor.order.tests',

setup.py

@@ -17,12 +17,13 @@
     install_requires=[
         'Babel>=1.3,<1.4a0',
         'BabelDjango>=0.2,<0.3a0',
-        'Django>=1.7,<1.8',
+        'Django>=1.7',
         'dj_database_url>=0.3.0',
-        'django-images>=0.4,<0.5a0',
+        'django-emailit>=0.2.2',
+        'django-images>=0.4.2,<0.5a0',
         'django-model-utils>=2.0.0,<2.1a0',
-        'django-mptt>=0.6.1,<0.7a0',
-        'django-offsite-storage>=0.0.3',
+        'django-mptt>=0.7.1',
+        'django-offsite-storage>=0.0.5',
         'django-payments>=0.6.1,<0.7a0',
         'django-prices>=0.3.3,<0.4a0',
         'django-selectable==0.8.0',