Merge pull request #17 from Captricity/yori-support-later-versions

python3 support

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
   - "2.7"
+  - "3.6"
 install:
   - pip install -r requirements.txt
   - pip install python-coveralls coverage

tests/test_account.py

@@ -1,7 +1,7 @@
 import unittest
 import datetime
 import operator
-import iso8601
+import pytz
 import recurly
 recurly.API_KEY = 'blah'
 
@@ -106,7 +106,7 @@ def test_simple_get_account(self):
             if k in ['uuid', 'uris']:
                 continue # skip
             if k == 'created_at':
-                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=iso8601.iso8601.Utc()))
+                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=pytz.utc))
             else:
                 self.assertEqual(getattr(account, k), v)
 
@@ -168,7 +168,7 @@ def test_address_get_account(self):
             if k in ['uuid', 'uris']:
                 continue # skip
             if k == 'created_at':
-                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=iso8601.iso8601.Utc()))
+                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=pytz.utc))
             elif k == 'address':
                 address = getattr(account, k)
                 self.assertEqual(type(address), recurly.Address)
@@ -189,7 +189,7 @@ def test_billing_info_get_account(self):
             if k in ['uuid', 'uris']:
                 continue # skip
             if k == 'created_at':
-                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=iso8601.iso8601.Utc()))
+                self.assertEqual(getattr(account, k), datetime.datetime(2014, 8, 11, 0, 0, tzinfo=pytz.utc))
             else:
                 self.assertEqual(getattr(account, k), v)
 

tests/test_subscriptions.py

@@ -1,7 +1,8 @@
 import unittest
 import datetime
-import iso8601
 import recurly
+from six import iterkeys
+from six.moves import filter
 from dateutil.relativedelta import relativedelta
 from recurly.errors import BadRequestError
 
@@ -109,15 +110,17 @@ def test_simple_plan_add_on_creation(self):
 
         self.assertEqual(len(mocurly.backend.plan_add_ons_backend.datastore), 2)
         foo_add_on_backed = mocurly.backend.plan_add_ons_backend.get_object(self.base_backed_plan_data['plan_code'] + '__foo')
-        foo_add_on = filter(lambda add_on: add_on['add_on_code'] == 'foo', self.base_add_on_data)[0]
+        add_ons = filter(lambda add_on: add_on['add_on_code'] == 'foo', self.base_add_on_data)
+        foo_add_on = next(add_ons)
         for k, v in foo_add_on.items():
             if k == 'unit_amount_in_cents':
                 self.assertEqual(foo_add_on_backed[k], dict((curr, str(amt)) for curr, amt in v.currencies.items()))
             else:
                 self.assertEqual(foo_add_on_backed[k], v)
 
         bar_add_on_backed = mocurly.backend.plan_add_ons_backend.get_object(self.base_backed_plan_data['plan_code'] + '__bar')
-        bar_add_on = filter(lambda add_on: add_on['add_on_code'] == 'bar', self.base_add_on_data)[0]
+        add_ons = filter(lambda add_on: add_on['add_on_code'] == 'bar', self.base_add_on_data)
+        bar_add_on = next(add_ons)
         for k, v in bar_add_on.items():
             if k == 'unit_amount_in_cents':
                 self.assertEqual(bar_add_on_backed[k], dict((curr, str(amt)) for curr, amt in v.currencies.items()))
@@ -320,8 +323,10 @@ def test_subscription_termination_partial_refund(self):
         # get the original transaction and invoice objects for use later
         self.assertEqual(len(mocurly.backend.transactions_backend.datastore), 1)
         self.assertEqual(len(mocurly.backend.invoices_backend.datastore), 1)
-        original_transaction_id = mocurly.backend.transactions_backend.datastore.keys()[0]
-        original_invoice_id = mocurly.backend.invoices_backend.datastore.keys()[0]
+        transaction_keys = iterkeys(mocurly.backend.transactions_backend.datastore)
+        invoice_keys = iterkeys(mocurly.backend.invoices_backend.datastore)
+        original_transaction_id = next(transaction_keys)
+        original_invoice_id = next(invoice_keys)
 
         # Now terminate it with a partial refund
         new_subscription.terminate(refund='partial')

tests/test_transaction.py

@@ -92,7 +92,7 @@ def test_transaction_failure(self):
         try:
             new_transaction.save()
             self.fail('No exception raised')
-        except recurly.ValidationError, exc:
+        except recurly.ValidationError as exc:
             self.assertEqual(exc.error, mocurly.errors.TRANSACTION_ERRORS[mocurly.errors.TRANSACTION_DECLINED]['customer'])
 
         self.assertEqual(len(mocurly.backend.transactions_backend.datastore), 1)

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = recurly2.2-py27, recurly-latest-py27, latest-httpretty-py27, recurly-latest-py36
+envlist = recurly2.2-py27, recurly-latest-py27, recurly-latest-py36
 
 [testenv]
 commands = {envpython} setup.py test
@@ -32,14 +32,14 @@ deps =
 [testenv:latest-httpretty-py27]
 basepython = python2.7
 deps =
-    httpretty
+    httpretty==0.9.4
     recurly
     {[testenv]deps}
 
 [testenv:recurly-latest-py36]
 basepython = python3.6
 deps =
-    httpretty
+    httpretty==0.8.10
     recurly
     {[testenv]deps}