Skip to content

Increase urlopen timeout in helper._request #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Increase urlopen timeout in helper._request #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e69d16a
Increase urlopen timeout in helper._request
flipcode Mar 26, 2013
e095f3e
Increase urlopen timeout in _postback
flipcode Mar 26, 2013
db56f11
Added recurring_payment_suspended_due_to_max_failed_payment signal
Sep 16, 2013
f27e046
Added recurring_payment_suspended_due_to_max_failed_payment signal
Sep 16, 2013
c5434a6
Addee recurring_payment_suspended notification
Sep 17, 2013
569bba5
Fixed signal bug
Sep 18, 2013
93b5799
implemented getRecurringPaymentsProfileDetails
Sep 23, 2013
efdb7d6
updated pending reason length
flipcode Aug 3, 2016
13837c3
fixed admin nvp search fields
flipcode Aug 3, 2016
dc24539
added pending_reason migration
flipcode Aug 3, 2016
b368d3c
added pending_reason migration
flipcode Aug 3, 2016
a9ebeeb
Updated setup file
flipcode Aug 3, 2016
061d27b
updated case id length
flipcode Aug 3, 2016
12a4c24
fixed case_creation_date
flipcode Aug 3, 2016
a8f21f5
fixed case_creation_date
flipcode Aug 3, 2016
d09edf2
fixed reason code length
flipcode Aug 3, 2016
4724965
added retry_at to ipn form
flipcode Aug 3, 2016
57a22b8
updated payment status length
flipcode Aug 3, 2016
4297f37
updated reason code length
flipcode Aug 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion paypal/pro/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
class PayPalNVPAdmin(admin.ModelAdmin):
list_display = ('user', 'ipaddress', 'method', 'flag', 'flag_code', 'created_at')
list_filter = ('flag', 'created_at')
search_fields = ('user__email', 'ip_address', 'flag', 'firstname', 'lastname')
search_fields = ('user__email', 'ipaddress', 'flag', 'firstname', 'lastname')
admin.site.register(PayPalNVP, PayPalNVPAdmin)
13 changes: 9 additions & 4 deletions paypal/pro/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ def massPay(self, params):
raise NotImplementedError

def getRecurringPaymentsProfileDetails(self, params):
raise NotImplementedError
defaults = {"method": "GetRecurringPaymentsProfileDetails"}
required = L("profileid")
nvp_obj = self._fetch(params, required, defaults)
if nvp_obj.flag:
raise PayPalFailure(nvp_obj.flag_info)
return nvp_obj

def updateRecurringPaymentsProfile(self, params):
defaults = {"method": "UpdateRecurringPaymentsProfile"}
Expand All @@ -163,10 +168,10 @@ def updateRecurringPaymentsProfile(self, params):
if nvp_obj.flag:
raise PayPalFailure(nvp_obj.flag_info)
return nvp_obj

def billOutstandingAmount(self, params):
raise NotImplementedError

def manangeRecurringPaymentsProfileStatus(self, params, fail_silently=False):
"""
Requires `profileid` and `action` params.
Expand Down Expand Up @@ -242,7 +247,7 @@ def _fetch(self, params, required, defaults):

def _request(self, data):
"""Moved out to make testing easier."""
return urllib2.urlopen(self.endpoint, data).read()
return urllib2.urlopen(self.endpoint, data, 20).read()

def _check_and_update_params(self, required, params):
"""
Expand Down
2 changes: 2 additions & 0 deletions paypal/standard/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,5 @@ class PayPalStandardBaseForm(forms.ModelForm):
next_payment_date = forms.DateTimeField(required=False, input_formats=PAYPAL_DATE_FORMAT)
subscr_date = forms.DateTimeField(required=False, input_formats=PAYPAL_DATE_FORMAT)
subscr_effective = forms.DateTimeField(required=False, input_formats=PAYPAL_DATE_FORMAT)
case_creation_date = forms.DateTimeField(required=False, input_formats=PAYPAL_DATE_FORMAT)
retry_at = forms.DateTimeField(required=False, input_formats=PAYPAL_DATE_FORMAT)
132 changes: 132 additions & 0 deletions paypal/standard/ipn/migrations/0002_pending_reason_length.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# -*- coding: utf-8 -*-
from django.db import models
from south.db import db
from paypal.standard.ipn.models import *

class Migration:
def forwards(self, orm):

db.alter_column('paypal_ipn', 'pending_reason', models.CharField(max_length=50, blank=True))

def backwards(self, orm):

db.alter_column('paypal_ipn', 'pending_reason', models.CharField(max_length=14, blank=True))


models = {
'ipn.paypalipn': {
'Meta': {'db_table': '"paypal_ipn"'},
'address_city': ('models.CharField', [], {'max_length': '40', 'blank': 'True'}),
'address_country': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'address_country_code': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'address_name': ('models.CharField', [], {'max_length': '128', 'blank': 'True'}),
'address_state': ('models.CharField', [], {'max_length': '40', 'blank': 'True'}),
'address_status': ('models.CharField', [], {'max_length': '11', 'blank': 'True'}),
'address_street': ('models.CharField', [], {'max_length': '200', 'blank': 'True'}),
'address_zip': ('models.CharField', [], {'max_length': '20', 'blank': 'True'}),
'amount': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'amount1': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'amount2': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'amount3': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'amount_per_cycle': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'auction_buyer_id': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'auction_closing_date': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'auction_multi_item': ('models.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}),
'auth_amount': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'auth_exp': ('models.CharField', [], {'max_length': '28', 'blank': 'True'}),
'auth_id': ('models.CharField', [], {'max_length': '19', 'blank': 'True'}),
'auth_status': ('models.CharField', [], {'max_length': '9', 'blank': 'True'}),
'business': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'case_creation_date': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'case_id': ('models.CharField', [], {'max_length': '14', 'blank': 'True'}),
'case_type': ('models.CharField', [], {'max_length': '24', 'blank': 'True'}),
'charset': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'contact_phone': ('models.CharField', [], {'max_length': '20', 'blank': 'True'}),
'created_at': ('models.DateTimeField', [], {'auto_now_add': 'True'}),
'currency_code': ('models.CharField', [], {'default': "'USD'", 'max_length': '32', 'blank': 'True'}),
'custom': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'exchange_rate': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '16', 'blank': 'True'}),
'first_name': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'flag': ('models.BooleanField', [], {'default': 'False', 'blank': 'True'}),
'flag_code': ('models.CharField', [], {'max_length': '16', 'blank': 'True'}),
'flag_info': ('models.TextField', [], {'blank': 'True'}),
'for_auction': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'from_view': ('models.CharField', [], {'max_length': '6', 'null': 'True', 'blank': 'True'}),
'handling_amount': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'id': ('models.AutoField', [], {'primary_key': 'True'}),
'initial_payment_amount': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'invoice': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'ipaddress': ('models.IPAddressField', [], {'blank': 'True'}),
'item_name': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'item_number': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'last_name': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'mc_amount1': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_amount2': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_amount3': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_currency': ('models.CharField', [], {'default': "'USD'", 'max_length': '32', 'blank': 'True'}),
'mc_fee': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_gross': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_handling': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'mc_shipping': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'memo': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'next_payment_date': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'notify_version': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'num_cart_items': ('models.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}),
'option_name1': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'option_name2': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'outstanding_balance': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'parent_txn_id': ('models.CharField', ['"Parent Transaction ID"'], {'max_length': '19', 'blank': 'True'}),
'password': ('models.CharField', [], {'max_length': '24', 'blank': 'True'}),
'payer_business_name': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'payer_email': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'payer_id': ('models.CharField', [], {'max_length': '13', 'blank': 'True'}),
'payer_status': ('models.CharField', [], {'max_length': '10', 'blank': 'True'}),
'payment_cycle': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'payment_date': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'payment_gross': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'payment_status': ('models.CharField', [], {'max_length': '9', 'blank': 'True'}),
'payment_type': ('models.CharField', [], {'max_length': '7', 'blank': 'True'}),
'pending_reason': ('models.CharField', [], {'max_length': '50', 'blank': 'True'}),
'period1': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'period2': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'period3': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'period_type': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'product_name': ('models.CharField', [], {'max_length': '128', 'blank': 'True'}),
'product_type': ('models.CharField', [], {'max_length': '128', 'blank': 'True'}),
'profile_status': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'protection_eligibility': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'quantity': ('models.IntegerField', [], {'default': '1', 'null': 'True', 'blank': 'True'}),
'query': ('models.TextField', [], {'blank': 'True'}),
'reason_code': ('models.CharField', [], {'max_length': '15', 'blank': 'True'}),
'reattempt': ('models.CharField', [], {'max_length': '1', 'blank': 'True'}),
'receipt_id': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'receiver_email': ('models.EmailField', [], {'max_length': '127', 'blank': 'True'}),
'receiver_id': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'recur_times': ('models.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}),
'recurring': ('models.CharField', [], {'max_length': '1', 'blank': 'True'}),
'recurring_payment_id': ('models.CharField', [], {'max_length': '128', 'blank': 'True'}),
'remaining_settle': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'residence_country': ('models.CharField', [], {'max_length': '2', 'blank': 'True'}),
'response': ('models.TextField', [], {'blank': 'True'}),
'retry_at': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'rp_invoice_id': ('models.CharField', [], {'max_length': '127', 'blank': 'True'}),
'settle_amount': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'settle_currency': ('models.CharField', [], {'max_length': '32', 'blank': 'True'}),
'shipping': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'shipping_method': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'subscr_date': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'subscr_effective': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'subscr_id': ('models.CharField', [], {'max_length': '19', 'blank': 'True'}),
'tax': ('models.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '64', 'decimal_places': '2', 'blank': 'True'}),
'test_ipn': ('models.BooleanField', [], {'default': 'False', 'blank': 'True'}),
'time_created': ('models.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'transaction_entity': ('models.CharField', [], {'max_length': '7', 'blank': 'True'}),
'transaction_subject': ('models.CharField', [], {'max_length': '255', 'blank': 'True'}),
'txn_id': ('models.CharField', ['"Transaction ID"'], {'max_length': '19', 'blank': 'True'}),
'txn_type': ('models.CharField', ['"Transaction Type"'], {'max_length': '128', 'blank': 'True'}),
'updated_at': ('models.DateTimeField', [], {'auto_now': 'True'}),
'username': ('models.CharField', [], {'max_length': '64', 'blank': 'True'}),
'verify_sign': ('models.CharField', [], {'max_length': '255', 'blank': 'True'})
}
}
complete_apps = ['ipn']
Loading