Revision f9224cc0

b/snf-astakos-app/astakos/im/forms.py
40 40
    UserCreationForm, AuthenticationForm,
41 41
    PasswordResetForm, PasswordChangeForm,
42 42
    SetPasswordForm)
43
from django.core.mail import send_mail
43
from django.core.mail import send_mail, get_connection
44 44
from django.contrib.auth.tokens import default_token_generator
45 45
from django.template import Context, loader
46 46
from django.utils.http import int_to_base36
......
517 517
            }
518 518
            from_email = settings.SERVER_EMAIL
519 519
            send_mail(_(PASSWORD_RESET_EMAIL_SUBJECT),
520
                      t.render(Context(c)), from_email, [user.email])
520
                      t.render(Context(c)),
521
                      from_email,
522
                      [user.email],
523
                      connection=get_connection)
521 524

  
522 525

  
523 526
class EmailChangeForm(forms.ModelForm):
b/snf-astakos-app/astakos/im/functions.py
36 36

  
37 37
from django.utils.translation import ugettext as _
38 38
from django.template.loader import render_to_string
39
from django.core.mail import send_mail
39
from django.core.mail import send_mail, get_connection
40 40
from django.core.urlresolvers import reverse
41 41
from django.template import Context, loader
42 42
from django.contrib.auth import (
......
126 126
                               'support': DEFAULT_CONTACT_EMAIL})
127 127
    sender = settings.SERVER_EMAIL
128 128
    try:
129
        send_mail(_(VERIFICATION_EMAIL_SUBJECT), message, sender, [user.email])
129
        send_mail(_(VERIFICATION_EMAIL_SUBJECT), message, sender, [user.email],
130
                  connection=get_connection())
131

  
130 132
    except (SMTPException, socket.error) as e:
131 133
        logger.exception(e)
132 134
        raise SendVerificationError()
......
155 157
    message = render_to_string(template_name, dictionary)
156 158
    sender = settings.SERVER_EMAIL
157 159
    try:
158
        send_mail(subject,
159
                  message, sender, [i[1] for i in settings.ADMINS])
160
        send_mail(subject, message, sender, [i[1] for i in settings.ADMINS],
161
                  connection=get_connection())
160 162
    except (SMTPException, socket.error) as e:
161 163
        logger.exception(e)
162 164
        raise SendNotificationError()
......
186 188
    )
187 189
    sender = settings.SERVER_EMAIL
188 190
    try:
189
        send_mail(
190
            _(HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % {'user': user.email},
191
            message, sender, [DEFAULT_CONTACT_EMAIL])
191
        send_mail(_(HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % {'user': user.email},
192
                  message, sender, [DEFAULT_CONTACT_EMAIL],
193
                  connection=get_connection())
192 194
    except (SMTPException, socket.error) as e:
193 195
        logger.exception(e)
194 196
        raise SendNotificationError()
......
213 215
                               'support': DEFAULT_CONTACT_EMAIL})
214 216
    sender = settings.SERVER_EMAIL
215 217
    try:
216
        send_mail(subject, message, sender, [invitation.username])
218
        send_mail(subject, message, sender, [invitation.username],
219
                  connection=get_connection())
217 220
    except (SMTPException, socket.error) as e:
218 221
        logger.exception(e)
219 222
        raise SendInvitationError()
220 223
    else:
221 224
        msg = 'Sent invitation %s' % invitation
222 225
        logger.log(LOGGING_LEVEL, msg)
223
        invitation.inviter.invitations = max(0, invitation.inviter.invitations - 1)
226
        inviter_invitations = invitation.inviter.invitations
227
        invitation.inviter.invitations = max(0, inviter_invitations - 1)
224 228
        invitation.inviter.save()
225 229

  
226 230

  
......
239 243
                               'support': DEFAULT_CONTACT_EMAIL})
240 244
    sender = settings.SERVER_EMAIL
241 245
    try:
242
        send_mail(subject, message, sender, [user.email])
246
        send_mail(subject, message, sender, [user.email],
247
                  connection=get_connection())
243 248
    except (SMTPException, socket.error) as e:
244 249
        logger.exception(e)
245 250
        raise SendGreetingError()
......
257 262
        'data': data,
258 263
        'user': user})
259 264
    try:
260
        send_mail(subject, content, from_email, recipient_list)
265
        send_mail(subject, content, from_email, recipient_list,
266
                  connection=get_connection())
261 267
    except (SMTPException, socket.error) as e:
262 268
        logger.exception(e)
263 269
        raise SendFeedbackError()
......
274 280
        t = loader.get_template(email_template_name)
275 281
        c = {'url': url, 'site_name': SITENAME}
276 282
        from_email = settings.SERVER_EMAIL
277
        send_mail(_(EMAIL_CHANGE_EMAIL_SUBJECT),
278
                  t.render(Context(c)), from_email, [ec.new_email_address])
283
        send_mail(_(EMAIL_CHANGE_EMAIL_SUBJECT), t.render(Context(c)),
284
                  from_email, [ec.new_email_address],
285
                  connection=get_connection())
279 286
    except (SMTPException, socket.error) as e:
280 287
        logger.exception(e)
281 288
        raise ChangeEmailError()
b/snf-pithos-app/pithos/api/delegate.py
82 82

  
83 83
    uri = proto + p.netloc + '/im/service/api/v2.0/feedback'
84 84
    headers = {'X-Auth-Token': SERVICE_TOKEN}
85
    values = dict([(k, v) for k, v in request.POST.items()])
85
    values = dict([(k, unicode(v).encode('utf-8')) for k, v in request.POST.items()])
86 86
    data = urllib.urlencode(values)
87 87
    req = urllib2.Request(uri, data, headers)
88 88
    try:

Also available in: Unified diff