Merge branch 'jtharris-py3k'

Author: jobelenus

.gitignore

@@ -5,3 +5,5 @@ docs/build
 build/
 dist/
 settings_local.py
+env/
+.idea/

pyavatax/base.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
 import json
+import six
 
 import requests
 from pyavatax.django_integration import get_django_recorder
@@ -9,12 +10,11 @@
 def str_to_class(klassname):
     """Returns class of string parameter. Requires class to be in module namespace"""
     import sys
-    import types
     try:
         identifier = getattr(sys.modules[__name__], klassname)
     except AttributeError:
         raise NameError("%s doesn't exist." % klassname)
-    if isinstance(identifier, (types.ClassType, types.TypeType)):
+    if isinstance(identifier, six.class_types):
         return identifier
     raise TypeError("%s is not a class." % klassname)
 
@@ -95,7 +95,7 @@ def _invalid_field(self, field):
 
     def update(self, *args, **kwargs):
         """Updates kwargs onto attributes of self"""
-        for k, v in kwargs.iteritems():
+        for k, v in six.iteritems(kwargs):
             if k in self._fields:
                 setattr(self, k, v)
             elif k in self._has:  # has an object
@@ -758,7 +758,7 @@ class TaxAddresses(AvalaraBase):
 
 class TaxDetails(AvalaraBase):
     """Represents TaxDetails response from Avalara"""
-    _fields = ['Country', 'Region', 'JurisType', 'Taxable', 'Rate', 'Tax', 'JurisName', 'TaxName']
+    _fields = ['Country', 'Region', 'JurisType', 'JurisCode', 'Taxable', 'Rate', 'Tax', 'JurisName', 'TaxName']
 
 
 class TaxLines(AvalaraBase):

requirements.txt

@@ -1,10 +1,11 @@
 # if you use pip to do installations, these are the dependencies
 
-requests==1.1  # for all http connection
+requests==2.5.3  # for all http connection
 decorator==3.4.0  # to preserve introspection funcsig integrity
-suds==0.4
+suds-jurko==0.6
+six==1.9.0
 # tests are run with pytest, fixtures for tests as well, Sphinx for documentation
-pytest==2.2.4
-testfixtures==2.3.5
+pytest==2.6.4
+testfixtures==4.1.2
 Sphinx==1.1.3
 simplejson==3.3.0

setup.py

@@ -10,7 +10,7 @@
     author = 'John Obelenus',
     author_email = '[email protected]',
     version=version,
-    install_requires = ['requests==1.1', 'decorator==3.4.0', 'suds==0.4'],
+    install_requires = ['requests==2.5.3', 'decorator==3.4.0', 'suds-jurko==0.6', 'six==1.9.0'],
     package_data = {
         '': ['*.txt', '*.rst', '*.md']
     },

test_avalara.py

@@ -4,6 +4,7 @@
 import datetime
 import pytest
 import uuid
+import six
 from testfixtures import LogCapture
 
 
@@ -110,18 +111,18 @@ def test_discount_from_data_example():
         ], 
         'DocCode': uuid.uuid4().hex, 
         'Lines': [ 
-            {'ItemCode': 'canon-eos-1dc', 'Discounted': True, 'LineNo': 1, 'DestinationCode': 2, 'Description': u'Canon EOS 1DC', 'Qty': 1L, 'Amount': 667.0, 'OriginCode': 1}, 
-            {'ItemCode': 'canon-24-70-f28l-ii', 'Discounted': True, 'LineNo': 2, 'DestinationCode': 2, 'Description': u'Canon 24-70 f/2.8L II', 'Qty': 1L, 'Amount': 111.0, 'OriginCode': 1}, 
-            {'ItemCode': 'sandisk-extreme-pro-cf-128gb', 'Discounted': True, 'LineNo': 3, 'DestinationCode': 2, 'Description': u'SanDisk Extreme Pro CF 128GB', 'Qty': 1L, 'Amount': 83.0, 'OriginCode': 1}, 
-            {'ItemCode': 'westcott-icelight', 'Discounted': True, 'LineNo': 4, 'DestinationCode': 2, 'Description': u'Westcott IceLight', 'Qty': 1L, 'Amount': 44.0, 'OriginCode': 1}, 
-            {'ItemCode': 'sennheiser-mke-400-camera-mic', 'Discounted': True, 'LineNo': 5, 'DestinationCode': 2, 'Description': u'Sennheiser MKE 400 On-Camera Mic', 'Qty': 1L, 'Amount': 53.5, 'OriginCode': 1},
+            {'ItemCode': 'canon-eos-1dc', 'Discounted': True, 'LineNo': 1, 'DestinationCode': 2, 'Description': u'Canon EOS 1DC', 'Qty': 1, 'Amount': 667.0, 'OriginCode': 1},
+            {'ItemCode': 'canon-24-70-f28l-ii', 'Discounted': True, 'LineNo': 2, 'DestinationCode': 2, 'Description': u'Canon 24-70 f/2.8L II', 'Qty': 1, 'Amount': 111.0, 'OriginCode': 1},
+            {'ItemCode': 'sandisk-extreme-pro-cf-128gb', 'Discounted': True, 'LineNo': 3, 'DestinationCode': 2, 'Description': u'SanDisk Extreme Pro CF 128GB', 'Qty': 1, 'Amount': 83.0, 'OriginCode': 1},
+            {'ItemCode': 'westcott-icelight', 'Discounted': True, 'LineNo': 4, 'DestinationCode': 2, 'Description': u'Westcott IceLight', 'Qty': 1, 'Amount': 44.0, 'OriginCode': 1},
+            {'ItemCode': 'sennheiser-mke-400-camera-mic', 'Discounted': True, 'LineNo': 5, 'DestinationCode': 2, 'Description': u'Sennheiser MKE 400 On-Camera Mic', 'Qty': 1, 'Amount': 53.5, 'OriginCode': 1},
         ], 
         'DocType': 'SalesOrder', 
         'Discount': str(amount), 
         'CustomerCode': '[email protected]' 
     } 
     tax = api.post_tax(data, commit=True)
-    print tax.error
+    six.print_(tax.error)
     assert tax.is_success is True
     assert float(tax.TotalTax) == 0
     assert float(tax.TotalAmount) == amount
@@ -304,23 +305,18 @@ def test_posttax():
 
 @pytest.mark.logging
 def test_timeout():
-    with LogCapture('pyavatax.api') as l:
-        api = get_api(timeout=0.00001)
-        lat = 47.627935
-        lng = -122.51702
-        line = Line(Amount=10.00)
-        doc = Document()
-        doc.add_line(line)
-        try:
-            api.get_tax(lat, lng, doc)
-        except AvalaraServerNotReachableException:
-            assert True
-        else:
-            assert False
-    l.check(
-        ('pyavatax.api', 'DEBUG', 'None inserting LineNo 1'),
-        ('pyavatax.api', 'WARNING', "HTTPSConnectionPool(host='development.avalara.net', port=443): Request timed out. (timeout=1e-05)")
-    )
+    api = get_api(timeout=0.00001)
+    lat = 47.627935
+    lng = -122.51702
+    line = Line(Amount=10.00)
+    doc = Document()
+    doc.add_line(line)
+    try:
+        api.get_tax(lat, lng, doc)
+    except AvalaraServerNotReachableException:
+        assert True
+    else:
+        assert False
 
 
 @pytest.mark.post_tax
@@ -539,7 +535,7 @@ def test_bad_json():
     import simplejson
     def fn():
         api = get_api()
-        data = {'Addresses': [{'City': u'Chicago', 'Country': 'US', 'Region': u'IL', 'Line2': u'', 'Line1': u'516 N Ogden Ave\r\nMailroom', 'PostalCode': u'60642', 'AddressCode': 2}, {'City': 'Concord', 'Country': 'US', 'Region': 'MA', 'Line2': '', 'Line1': '130B Baker Avenue Extension', 'PostalCode': '01742', 'AddressCode': 1}], 'DocCode': 'adoccode', 'Lines': [{'LineNo': 1, 'DestinationCode': 2, 'Description': u'Product 1', 'Qty': 1L, 'Amount': '161.00', 'OriginCode': 1}], 'DocType': 'SalesOrder', 'CustomerCode': 21051}
+        data = {'Addresses': [{'City': u'Chicago', 'Country': 'US', 'Region': u'IL', 'Line2': u'', 'Line1': u'516 N Ogden Ave\r\nMailroom', 'PostalCode': u'60642', 'AddressCode': 2}, {'City': 'Concord', 'Country': 'US', 'Region': 'MA', 'Line2': '', 'Line1': '130B Baker Avenue Extension', 'PostalCode': '01742', 'AddressCode': 1}], 'DocCode': 'adoccode', 'Lines': [{'LineNo': 1, 'DestinationCode': 2, 'Description': u'Product 1', 'Qty': 1, 'Amount': '161.00', 'OriginCode': 1}], 'DocType': 'SalesOrder', 'CustomerCode': 21051}
         stem = '/'.join([api.VERSION, 'tax', 'get'])
         resp = api._post(stem, data)
         tax_resp = PostTaxResponse(resp)