2to3 vendor/paypal/

vendor/paypal/standard/forms.py

@@ -103,7 +103,7 @@ class PayPalPaymentsForm(forms.Form):
         self.button_type = button_type
         if 'initial' in kwargs:
             # Dynamically create, so we can support everything PayPal does.
-            for k, v in kwargs['initial'].items():
+            for k, v in list(kwargs['initial'].items()):
                 if k not in self.base_fields:
                     self.fields[k] = forms.CharField(label=k, widget=ValueHiddenInput(), initial=v)
 
@@ -119,7 +119,7 @@ class PayPalPaymentsForm(forms.Form):
 
 
     def render(self):
-        return mark_safe(u"""<form action="%s" method="post">
+        return mark_safe("""<form action="%s" method="post">
     %s
     <input type="image" src="%s" border="0" name="submit" alt="Buy it Now" />
 </form>""" % (self.get_endpoint(), self.as_p(), self.get_image()))
@@ -173,7 +173,7 @@ class PayPalEncryptedPaymentsForm(PayPalPaymentsForm):
 
         # Iterate through the fields and pull out the ones that have a value.
         plaintext = 'cert_id=%s\n' % CERT_ID
-        for name, field in self.fields.items():
+        for name, field in list(self.fields.items()):
             value = None
             if name in self.initial:
                 value = self.initial[name]
@@ -183,7 +183,7 @@ class PayPalEncryptedPaymentsForm(PayPalPaymentsForm):
                 # @@@ Make this less hackish and put it in the widget.
                 if name == "return_url":
                     name = "return"
-                plaintext += u'%s=%s\n' % (name, value)
+                plaintext += '%s=%s\n' % (name, value)
         plaintext = plaintext.encode('utf-8')
 
         # Begin crypto weirdness.
@@ -203,7 +203,7 @@ class PayPalEncryptedPaymentsForm(PayPalPaymentsForm):
         return out.read()
 
     def as_p(self):
-        return mark_safe(u"""
+        return mark_safe("""
 <input type="hidden" name="cmd" value="_s-xclick" />
 <input type="hidden" name="encrypted" value="%s" />
         """ % self._encrypt())

vendor/paypal/standard/helpers.py

@@ -49,13 +49,13 @@ def make_secret(form_instance, secret_fields=None):
     for name in secret_fields:
         if hasattr(form_instance, 'cleaned_data'):
             if name in form_instance.cleaned_data:
-                data += unicode(form_instance.cleaned_data[name])
+                data += str(form_instance.cleaned_data[name])
         else:
             # Initial data passed into the constructor overrides defaults.
             if name in form_instance.initial:
-                data += unicode(form_instance.initial[name])
+                data += str(form_instance.initial[name])
             elif name in form_instance.fields and form_instance.fields[name].initial is not None:
-                data += unicode(form_instance.fields[name].initial)
+                data += str(form_instance.fields[name].initial)
 
     secret = get_sha1_hexdigest(settings.SECRET_KEY, data)
     return secret

vendor/paypal/standard/ipn/tests/test_ipn.py

@@ -139,7 +139,7 @@ class IPNTest(IPNTestBase):
     def test_correct_ipn(self):
         ipn_obj = self.assertGotSignal(payment_was_successful, False)
         # Check some encoding issues:
-        self.assertEqual(ipn_obj.first_name, u"J\u00f6rg")
+        self.assertEqual(ipn_obj.first_name, "J\\u00f6rg")
 
     def test_failed_ipn(self):
         PayPalIPN._postback = lambda self: b("INVALID")
@@ -185,7 +185,7 @@ class IPNTest(IPNTestBase):
 
     def test_invalid_payment_status(self):
         update = {"payment_status": "Failure"}
-        flag_info = u"Invalid payment_status. (Failure)"
+        flag_info = "Invalid payment_status. (Failure)"
         self.assertFlagged(update, flag_info)
 
     def test_vaid_payment_status_cancelled(self):
@@ -321,7 +321,7 @@ class IPNTest(IPNTestBase):
         self.paypal_post(params)
         ipn = PayPalIPN.objects.get()
         self.assertEqual(ipn.posted_data_dict['quantity1'], '3')
-        self.assertEqual(ipn.posted_data_dict['first_name'], u"J\u00f6rg")
+        self.assertEqual(ipn.posted_data_dict['first_name'], "J\\u00f6rg")
 
 class IPNPostbackTest(IPNTestBase):
     """
@@ -329,4 +329,4 @@ class IPNPostbackTest(IPNTestBase):
     """
     def test_postback(self):
         # Incorrect signature means we will always get failure
-        self.assertFlagged({}, u'Invalid postback. (INVALID)')
+        self.assertFlagged({}, 'Invalid postback. (INVALID)')

vendor/paypal/standard/pdt/tests/__init__.py

@@ -1 +0,0 @@
-from .test_pdt import *

vendor/paypal/standard/widgets.py

@@ -14,7 +14,7 @@ class ValueHiddenInput(forms.HiddenInput):
 
     def render(self, name, value, attrs=None):
         if value is None:
-            return u''
+            return ''"
         else:
             return super(ValueHiddenInput, self).render(name, value, attrs)
 
@@ -27,8 +27,8 @@ class ReservedValueHiddenInput(ValueHiddenInput):
 
     def render(self, name, value, attrs=None):
         if value is None:
-            value = ''
+            value = ''"
         final_attrs = self.build_attrs(attrs, {"type": self.input_type})
-        if value != '':
+        if value != ''":
             final_attrs['value'] = force_text(value)
-        return mark_safe(u'<input%s />' % flatatt(final_attrs))
+        return mark_safe('<input%s />' % flatatt(final_attrs))