Merge pull request #51 from EasyPost/dlc37_unite_python2_and_3

Dicts iterate differently on python 2 vs. 3. Let's sort.

Author: dlc37

README.md

@@ -80,7 +80,7 @@ try:
         weight = 21.2
     )
 except easypost.Error as e:
-    print(e.message)
+    print(str(e))
     if e.param is not None:
         print('Specifically an invalid param: %r' % e.param)
 
@@ -136,7 +136,7 @@ print(shipment.insurance)
 Documentation
 -------------
 
-Up-to-date documentation at: <https://www.easypost.com/docs>
+Up-to-date documentation is available at: <https://www.easypost.com/docs>
 
 
 Client Library Development

easypost/__init__.py

@@ -166,7 +166,7 @@ def _utf8(cls, value):
     @classmethod
     def encode_dict(cls, out, key, dict_value):
         n = {}
-        for k, v in six.iteritems(dict_value):
+        for k, v in sorted(six.iteritems(dict_value)):
             k = cls._utf8(k)
             v = cls._utf8(v)
             n["%s[%s]" % (key, k)] = v
@@ -203,7 +203,7 @@ def _encode_inner(cls, params):
             ENCODERS[type(None)] = cls.encode_none
 
         out = []
-        for key, value in six.iteritems(params):
+        for key, value in sorted(six.iteritems(params)):
             key = cls._utf8(key)
             try:
                 encoder = ENCODERS[value.__class__]
@@ -449,7 +449,7 @@ def construct_from(cls, values, api_key=None, parent=None, name=None):
     def refresh_from(self, values, api_key):
         self.api_key = api_key
 
-        for k, v in six.iteritems(values):
+        for k, v in sorted(six.iteritems(values)):
             if k == 'id' and self.id != v:
                 self.id = v
 

tests/test_report.py

@@ -11,7 +11,7 @@ def test_shipment_report():
     )
 
     assert report.object == "ShipmentReport"
-    assert report.status == "available"
+    assert report.status in ("available", "new")
     assert report.__class__ == easypost.Report
 
     report2 = easypost.Report.retrieve(report.id)
@@ -32,7 +32,7 @@ def test_payment_log_report():
     )
 
     assert report.object == "PaymentLogReport"
-    assert report.status == "available"
+    assert report.status in ("available", "new")
     assert report.__class__ == easypost.Report
 
     report2 = easypost.Report.retrieve(report.id)

tests/test_webhook.py

@@ -28,7 +28,7 @@ def test_webhooks(per_run_unique):
 
     # Index webhooks
     webhooks = easypost.Webhook.all(url=expected_url)
-    assert webhooks["webhooks"][len(webhooks["webhooks"]) - 1].id == webhook.id
+    assert any(wh.id == webhook.id for wh in webhooks['webhooks'])
 
     # Delete a webhook
     webhook.delete()