diff options
29 files changed, 44 insertions, 44 deletions
diff --git a/postgresqleu/accountinfo/views.py b/postgresqleu/accountinfo/views.py index 68d93e95..3495ef90 100644 --- a/postgresqleu/accountinfo/views.py +++ b/postgresqleu/accountinfo/views.py @@ -48,7 +48,7 @@ def importuser(request): uid = request.POST['uid'] try: user_import(uid) - except Exception, e: + except Exception as e: return HttpResponse('%s' % e, content_type='text/plain') return HttpResponse('OK', content_type='text/plain') diff --git a/postgresqleu/adyen/management/commands/process_adyen_reports.py b/postgresqleu/adyen/management/commands/process_adyen_reports.py index d256254a..698adc51 100644 --- a/postgresqleu/adyen/management/commands/process_adyen_reports.py +++ b/postgresqleu/adyen/management/commands/process_adyen_reports.py @@ -57,7 +57,7 @@ class Command(BaseCommand): report.contents = resp report.save() AdyenLog(message='Downloaded report {0}'.format(report.url), error=False).save() - except Exception, ex: + except Exception as ex: self.stderr.write("Failed to download report {0}: {1}".format(report.url, ex)) # This might fail again if we had a db problem, but it should be OK as long as it # was just a download issue which is most likely. @@ -228,6 +228,6 @@ class Command(BaseCommand): report.processedat = datetime.now() report.save() AdyenLog(message='Processed report %s' % report.url, error=False).save() - except Exception, ex: + except Exception as ex: self.stderr.write("Failed to process report {0}: {1}".format(report.url, ex)) AdyenLog(message='Failed to process report %s: %s' % (report.url, ex), error=True).save() diff --git a/postgresqleu/adyen/util.py b/postgresqleu/adyen/util.py index 7a0604cd..b113696a 100644 --- a/postgresqleu/adyen/util.py +++ b/postgresqleu/adyen/util.py @@ -131,7 +131,7 @@ def process_authorization(notification): 'Adyen payment authorized', "An Adyen payment of %s%s with reference %s was authorized on the Adyen platform.\nInvoice: %s\nRecipient name: %s\nRecipient user: %s\nPayment method: %s\nAdyen reference: %s\n" % (settings.CURRENCY_ABBREV, notification.amount, notification.merchantReference, invoice.title, invoice.recipient_name, invoice.recipient_email, notification.paymentMethod, notification.pspReference)) - except AdyenProcessingException, ex: + except AdyenProcessingException as ex: # Generate an email telling us about this exception! send_simple_mail(settings.INVOICE_SENDER_EMAIL, settings.ADYEN_NOTIFICATION_RECEIVER, @@ -402,7 +402,7 @@ class AdyenAPI(object): try: r = self._api_call('pal/servlet/Payment/v12/refund', apiparam, '[refund-received]') return r['pspReference'] - except Exception, e: + except Exception as e: raise Exception("API call to refund transaction {0} (refund {1}) failed: {2}".format( transreference, refundid, diff --git a/postgresqleu/braintreepayment/management/commands/update_braintree_transactions.py b/postgresqleu/braintreepayment/management/commands/update_braintree_transactions.py index e8b3bb66..27042758 100755 --- a/postgresqleu/braintreepayment/management/commands/update_braintree_transactions.py +++ b/postgresqleu/braintreepayment/management/commands/update_braintree_transactions.py @@ -42,7 +42,7 @@ class Command(BaseCommand): # Process all transactions that are not settled and disbursed try: btrans = braintree.Transaction.find(t.transid) - except braintree.exceptions.not_found_error.NotFoundError, ex: + except braintree.exceptions.not_found_error.NotFoundError as ex: BraintreeLog(transid=t.transid, error=True, message='Could not find transaction {0}: {1}'.format(t.transid, ex)).save() diff --git a/postgresqleu/braintreepayment/views.py b/postgresqleu/braintreepayment/views.py index e4f94377..270b023f 100644 --- a/postgresqleu/braintreepayment/views.py +++ b/postgresqleu/braintreepayment/views.py @@ -87,7 +87,7 @@ def payment_post(request): invoice_logger, InvoicePaymentMethod.objects.get(classname='postgresqleu.util.payment.braintree.Braintree'), ) - except BraintreeProcessingException, ex: + except BraintreeProcessingException as ex: send_simple_mail(settings.INVOICE_SENDER_EMAIL, settings.BRAINTREE_NOTIFICATION_RECEIVER, 'Exception occurred processing Braintree result', diff --git a/postgresqleu/confreg/admin.py b/postgresqleu/confreg/admin.py index 72eee693..535f2ec4 100644 --- a/postgresqleu/confreg/admin.py +++ b/postgresqleu/confreg/admin.py @@ -329,7 +329,7 @@ class SpeakerAdminForm(ConcurrentProtectedModelForm): p.feed(self.cleaned_data['photofile'].read()) p.close() img = p.image - except Exception, e: + except Exception as e: raise ValidationError("Could not parse image: %s" % e) if img.format != 'JPEG': raise ValidationError("Only JPEG format images are accepted, not '%s'" % img.format) diff --git a/postgresqleu/confreg/backendviews.py b/postgresqleu/confreg/backendviews.py index d3e8e331..41b62626 100644 --- a/postgresqleu/confreg/backendviews.py +++ b/postgresqleu/confreg/backendviews.py @@ -289,7 +289,7 @@ def twitter_integration(request, urlname): (auth_url, ownerkey, ownersecret) = TwitterSetup.get_authorization_data() request.session['ownerkey'] = ownerkey request.session['ownersecret'] = ownersecret - except Exception, e: + except Exception as e: messages.error(request, 'Failed to talk to twitter: %s' % e) return HttpResponseRedirect('.') diff --git a/postgresqleu/confreg/forms.py b/postgresqleu/confreg/forms.py index c8ae8c83..32a376d5 100644 --- a/postgresqleu/confreg/forms.py +++ b/postgresqleu/confreg/forms.py @@ -436,7 +436,7 @@ class SpeakerProfileForm(forms.ModelForm): p.feed(self.cleaned_data['photofile'].read()) p.close() img = p.image - except Exception, e: + except Exception as e: raise ValidationError("Could not parse image: %s" % e) if img.format != 'JPEG': raise ValidationError("Only JPEG format images are accepted, not '%s'" % img.format) diff --git a/postgresqleu/confreg/jinjafunc.py b/postgresqleu/confreg/jinjafunc.py index 24910124..893f75f9 100644 --- a/postgresqleu/confreg/jinjafunc.py +++ b/postgresqleu/confreg/jinjafunc.py @@ -231,7 +231,7 @@ def render_jinja_conference_response(request, conference, pagemagic, templatenam try: with open(os.path.join(conference.jinjadir, 'templates/context.json')) as f: c = json.load(f) - except ValueError, e: + except ValueError as e: return HttpResponse("JSON parse failed: {0}".format(e), content_type="text/plain") except Exception: c = {} @@ -289,7 +289,7 @@ class JinjaTemplateValidator(object): def __call__(self, s): try: render_sandboxed_template(s, self.context) - except jinja2.TemplateSyntaxError, e: + except jinja2.TemplateSyntaxError as e: raise ValidationError("Template syntax error: %s" % e) - except Exception, e: + except Exception as e: raise ValidationError("Failed to parse template: %s" % e) diff --git a/postgresqleu/confreg/jinjapdf.py b/postgresqleu/confreg/jinjapdf.py index 418f2a2d..b8f0fc42 100755 --- a/postgresqleu/confreg/jinjapdf.py +++ b/postgresqleu/confreg/jinjapdf.py @@ -241,7 +241,7 @@ class JinjaRenderer(object): s = self.template.render(**ctx) try: js = json.loads(s) - except ValueError, e: + except ValueError as e: if self.debug: print "JSON parse failed. Template output:" print s diff --git a/postgresqleu/confreg/reporting.py b/postgresqleu/confreg/reporting.py index 61d57975..c13e857f 100644 --- a/postgresqleu/confreg/reporting.py +++ b/postgresqleu/confreg/reporting.py @@ -47,7 +47,7 @@ def timereport(request): 'trendlines_supported': report.does_trendlines, 'helplink': 'reports#time', }) - except ReportException, e: + except ReportException as e: messages.error(request, e) return render(request, 'confreg/timereport.html', { 'form': form, diff --git a/postgresqleu/confreg/reports.py b/postgresqleu/confreg/reports.py index c481ed2e..7b113a9a 100644 --- a/postgresqleu/confreg/reports.py +++ b/postgresqleu/confreg/reports.py @@ -294,7 +294,7 @@ def build_attendee_report(conference, POST): resp = HttpResponse(content_type='application/pdf') render_jinja_badges(conference, result, resp, borders, pagebreaks) return resp - except Exception, e: + except Exception as e: return HttpResponse("Exception occured: %s" % e, content_type='text/plain') else: raise Exception("Unknown format") diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index 5282a9d8..0d411949 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -550,7 +550,7 @@ def multireg_newinvoice(request, confname): else: try: invoicerows.extend(invoicerows_for_registration(r, finalize)) - except InvoicerowsException, ex: + except InvoicerowsException as ex: errors.append(u'{0}: {1}'.format(r.email, ex)) for r in invoicerows: @@ -2177,7 +2177,7 @@ def bulkpay(request, confname): totalcost += s invoicerows.extend(regrows) - except InvoicerowsException, ex: + except InvoicerowsException as ex: state.append({'email': e, 'found': 1, 'pay': 0, 'text': unicode(ex)}) errors = 1 @@ -3251,7 +3251,7 @@ def transfer_reg(request, urlname): if fromreg.regtype.specialtype: try: validate_special_reg_type(fromreg.regtype.specialtype, toreg) - except ValidationError, e: + except ValidationError as e: raise ValidationError("Registration type cannot be transferred: %s" % e.message) toreg.regtype = fromreg.regtype @@ -3354,7 +3354,7 @@ def transfer_reg(request, urlname): steps = list(_make_transfer(form.cleaned_data['transfer_from'], form.cleaned_data['transfer_to'], )) - except ValidationError, e: + except ValidationError as e: form.add_error(None, e) form.remove_confirm() diff --git a/postgresqleu/confsponsor/backendforms.py b/postgresqleu/confsponsor/backendforms.py index f13b82be..5efd2355 100644 --- a/postgresqleu/confsponsor/backendforms.py +++ b/postgresqleu/confsponsor/backendforms.py @@ -92,7 +92,7 @@ class BackendSponsorshipLevelBenefitForm(BackendForm): benefit.params = dp try: benefit.do_validate_params() - except ValidationError, e: + except ValidationError as e: self.add_error('class_parameters', e) return cleaned_data diff --git a/postgresqleu/confsponsor/benefitclasses/imageupload.py b/postgresqleu/confsponsor/benefitclasses/imageupload.py index f465a3af..6d145819 100644 --- a/postgresqleu/confsponsor/benefitclasses/imageupload.py +++ b/postgresqleu/confsponsor/benefitclasses/imageupload.py @@ -38,7 +38,7 @@ class ImageUploadForm(BaseBenefitForm): p.feed(imagedata.read()) p.close() image = p.image - except Exception, e: + except Exception as e: raise ValidationError("Could not parse image: %s" % e) if image.format != self.params['format'].upper(): raise ValidationError("Only %s format images are accepted, not '%s'" % (self.params['format'].upper(), image.format)) diff --git a/postgresqleu/confsponsor/views.py b/postgresqleu/confsponsor/views.py index 5d29b8fe..9204eec6 100644 --- a/postgresqleu/confsponsor/views.py +++ b/postgresqleu/confsponsor/views.py @@ -144,7 +144,7 @@ def sponsor_manager_add(request, sponsorid): messages.info(request, "User %s added as manager." % u.username) except User.DoesNotExist: messages.warning(request, "Failed to re-find user %s after import" % users[0]['u']) - except Exception, e: + except Exception as e: messages.warning(request, "Failed to import user with email %s (userid %s): %s" % (users[0]['e'], users[0]['u'], e)) else: messages.warning(request, "Could not find user with email address %s" % request.POST['email']) diff --git a/postgresqleu/invoices/payment.py b/postgresqleu/invoices/payment.py index b49b21e0..3c1c6455 100644 --- a/postgresqleu/invoices/payment.py +++ b/postgresqleu/invoices/payment.py @@ -52,7 +52,7 @@ class PaymentMethodWrapper(object): def paymenturl(self): try: return self.implementation.build_payment_url(self.invoicestr, self.invoiceamount, self.invoiceid, self.returnurl) - except Exception, ex: + except Exception as ex: print ex @property diff --git a/postgresqleu/invoices/util.py b/postgresqleu/invoices/util.py index 0f71b5ab..c1f35548 100644 --- a/postgresqleu/invoices/util.py +++ b/postgresqleu/invoices/util.py @@ -364,7 +364,7 @@ class InvoiceManager(object): return (self.RESULT_PROCESSORFAIL, None, None) try: processor.process_invoice_payment(invoice) - except Exception, ex: + except Exception as ex: logger("Failed to run invoice processor '%s': %s" % (invoice.processor, ex)) return (self.RESULT_PROCESSORFAIL, None, None) @@ -444,7 +444,7 @@ class InvoiceManager(object): classname = pieces[-1] mod = __import__(modname, fromlist=[classname, ]) return getattr(mod, classname)() - except Exception, ex: + except Exception as ex: if logger: logger("Failed to instantiate invoice processor '%s': %s" % (invoice.processor, ex)) return None @@ -460,7 +460,7 @@ class InvoiceManager(object): if processor: try: processor.process_invoice_cancellation(invoice) - except Exception, ex: + except Exception as ex: raise Exception("Failed to run invoice processor '%s': %s" % (invoice.processor, ex)) invoice.deleted = True diff --git a/postgresqleu/invoices/views.py b/postgresqleu/invoices/views.py index 9d86cdb3..194bc6f1 100644 --- a/postgresqleu/invoices/views.py +++ b/postgresqleu/invoices/views.py @@ -281,7 +281,7 @@ def cancelinvoice(request, invoicenum): manager = InvoiceManager() try: manager.cancel_invoice(invoice, reason) - except Exception, ex: + except Exception as ex: messages.warning(request, "Failed to cancel: %s" % ex) return HttpResponseRedirect("/invoiceadmin/%s/" % invoice.id) diff --git a/postgresqleu/mailqueue/admin.py b/postgresqleu/mailqueue/admin.py index b99a3b63..46a6aa1f 100644 --- a/postgresqleu/mailqueue/admin.py +++ b/postgresqleu/mailqueue/admin.py @@ -25,7 +25,7 @@ class QueuedMailAdmin(admin.ModelAdmin): if b: return b return "Could not find body" - except Exception, e: + except Exception as e: return "Failed to get body: %s" % e parsed_content.short_description = 'Parsed mail' diff --git a/postgresqleu/paypal/management/commands/paypal_fetch.py b/postgresqleu/paypal/management/commands/paypal_fetch.py index 54d843f7..809c2df1 100644 --- a/postgresqleu/paypal/management/commands/paypal_fetch.py +++ b/postgresqleu/paypal/management/commands/paypal_fetch.py @@ -32,7 +32,7 @@ class PaypalBaseTransaction(object): self.transinfo.amount = Decimal(apistruct['AMT']) self.transinfo.fee = -Decimal(apistruct['FEEAMT']) self.transinfo.sendername = apistruct['NAME'] - except Exception, e: + except Exception as e: self.message = "Unable to parse: %s" % e def __str__(self): @@ -81,7 +81,7 @@ class PaypalTransaction(PaypalBaseTransaction): super(PaypalTransaction, self).__init__(apistruct) try: self.transinfo.sender = apistruct['EMAIL'] - except Exception, e: + except Exception as e: self.message = "Unable to parse: %s" % e diff --git a/postgresqleu/paypal/management/commands/refund_paypal_transaction.py b/postgresqleu/paypal/management/commands/refund_paypal_transaction.py index cc506199..27429a31 100644 --- a/postgresqleu/paypal/management/commands/refund_paypal_transaction.py +++ b/postgresqleu/paypal/management/commands/refund_paypal_transaction.py @@ -57,7 +57,7 @@ class Command(BaseCommand): r = api.refund_transaction(t.paypaltransid, t.amount, True, options['message']) print("Successfully refunded {0} (paypal id {1}, refund id {2})".format(t.id, t.paypaltransid, r)) time.sleep(1) - except Exception, e: + except Exception as e: print("FAILED to refund {0} (paypal id {1}): {2}".format(t.id, t.paypaltransid, e)) print("Done.") diff --git a/postgresqleu/paypal/views.py b/postgresqleu/paypal/views.py index 50fa4734..74714733 100644 --- a/postgresqleu/paypal/views.py +++ b/postgresqleu/paypal/views.py @@ -65,7 +65,7 @@ def paypal_return_handler(request): u = urllib2.urlopen(settings.PAYPAL_BASEURL, urlencode(params)) r = u.read() u.close() - except Exception, ex: + except Exception as ex: # Failed to talk to paypal somehow. It should be ok to retry. return paypal_error('Failed to verify status with paypal: %s' % ex) @@ -91,7 +91,7 @@ def paypal_return_handler(request): return paypal_error('Received payment for %s which is not the correct recipient!' % d['business']) if d['mc_currency'] != settings.CURRENCY_ABBREV: return paypal_error('Received payment in %s, not %s. We cannot currently process this automatically.' % (d['mc_currency'], settings.CURRENCY_ABBREV)) - except KeyError, k: + except KeyError as k: return paypal_error('Mandatory field %s is missing from paypal data!', k) # Now let's find the state of the payment diff --git a/postgresqleu/settings.py b/postgresqleu/settings.py index 7ef1d9b0..da938ab7 100644 --- a/postgresqleu/settings.py +++ b/postgresqleu/settings.py @@ -226,7 +226,7 @@ TWITTER_NEWS_TOKENSECRET = "" # If there is a local_settings.py, let it override our settings try: from local_settings import * -except ImportError, e: +except ImportError as e: pass PRELOAD_URLS = [] @@ -242,12 +242,12 @@ if 'SYSTEM_SKIN_DIRECTORY' in globals(): # Load a skin settings file (URLs etc) try: from skin_settings import * - except ImportError, e: + except ImportError as e: pass # Then, load a local settings file from there try: from skin_local_settings import * - except ImportError, e: + except ImportError as e: pass if 'SKIN_APPS' in globals(): INSTALLED_APPS.extend(SKIN_APPS) diff --git a/postgresqleu/trustlypayment/util.py b/postgresqleu/trustlypayment/util.py index 8c8ca2ad..0b208ba5 100644 --- a/postgresqleu/trustlypayment/util.py +++ b/postgresqleu/trustlypayment/util.py @@ -61,7 +61,7 @@ class Trustly(TrustlyWrapper): # Raw is confirmed, but parsed one is still pending. So handle that one. try: self.process_notification(n) - except Exception, e: + except Exception as e: self.log_and_email("Exception processing notification {0}: {1}".format(n.id, e)) # If we somehow failed to handle at this level, we still flag things as ok to @@ -115,7 +115,7 @@ class Trustly(TrustlyWrapper): trans.completedat = datetime.now() try: self.process_completed_payment(trans) - except TrustlyException, e: + except TrustlyException as e: self.log_and_email(e) return False trans.save() diff --git a/postgresqleu/trustlypayment/views.py b/postgresqleu/trustlypayment/views.py index f2368d6d..c179808d 100644 --- a/postgresqleu/trustlypayment/views.py +++ b/postgresqleu/trustlypayment/views.py @@ -70,7 +70,7 @@ def invoicepayment_secret(request, invoiceid, secret): # With the transaction saved, redirect the user to Trustly return HttpResponseRedirect(r['data']['url']) - except TrustlyException, e: + except TrustlyException as e: return HttpResponse("Error communicating with Trustly: {0}".format(e)) diff --git a/postgresqleu/util/messaging/twitter.py b/postgresqleu/util/messaging/twitter.py index f39fd8eb..06b2e585 100644 --- a/postgresqleu/util/messaging/twitter.py +++ b/postgresqleu/util/messaging/twitter.py @@ -38,7 +38,7 @@ class Twitter(object): r = self.tw.get('https://api.twitter.com/1.1/users/show.json', params={'screen_name': tousername}) _cached_twitter_users[tousername] = r.json()['id'] - except Exception, e: + except Exception as e: return (False, None, "Failed to look up user %s: %s" % (tousername, e)) try: @@ -62,7 +62,7 @@ class Twitter(object): return (False, ej['code'], ej['message']) except: return (False, None, r.text) - except Exception, e: + except Exception as e: return (False, None, e) return (True, None, None) diff --git a/postgresqleu/util/payment/trustly.py b/postgresqleu/util/payment/trustly.py index b10231fa..20604692 100644 --- a/postgresqleu/util/payment/trustly.py +++ b/postgresqleu/util/payment/trustly.py @@ -30,7 +30,7 @@ Pay directly using online banking. Currently supported with most banks in {0}. t = Trustly() try: t.refund(trans.orderid, refund.fullamount) - except TrustlyException, e: + except TrustlyException as e: TrustlyLog(message='Refund API failed: {0}'.format(e), error=True).save() return False diff --git a/postgresqleu/util/validators.py b/postgresqleu/util/validators.py index edcc00d9..adda510c 100644 --- a/postgresqleu/util/validators.py +++ b/postgresqleu/util/validators.py @@ -111,7 +111,7 @@ class PictureUrlValidator(object): except ValidationError: raise - except Exception, e: + except Exception as e: raise ValidationError("Failed to parse image: %s" % e) def __eq__(self, other): |