Merge branch 'issue-107'

Closes #108

Reviewed by @jontsai and @mwaldt

Author: Roguelazer

.gitattributes

@@ -0,0 +1 @@
+/tests/cassettes/*.yaml binary

.gitignore

@@ -26,3 +26,4 @@ virtualenv
 .virtualenv
 .idea
 .coverage
+.env-override

.travis.yml

@@ -1,17 +1,23 @@
 language: python
 matrix:
   include:
-    - python: "2.7"
-    - python: "3.4"
-    - python: "3.5"
-    - python: "3.6"
-    - python: "pypy"
-    - python: "pypy3.5"
-    - python: 3.7
-      dist: xenial
-      sudo: true
+  - python: '2.7'
+  - python: '3.5'
+  - python: '3.6'
+  - python: pypy
+  - python: pypy3.5
+  - python: 3.7
+    dist: xenial
+    sudo: true
+  - python: 3.8
+    dist: xenial
+    sudo: true
 install:
-  - "pip install six requests"
-  - "pip install -r requirements-tests.txt"
-  - "python setup.py install"
-script: "pytest --cov=easypost --cov-report=term-missing tests/"
+- pip install six requests
+- pip install -r requirements-tests.txt
+- python setup.py install
+script: py.test --cov=easypost --cov-report=term-missing --vcr-record=none --cov-fail-under=60 tests/
+env:
+  global:
+  - secure: GY8+PX7WH8nZUK26F/7ygkYoWi6iXvetJybkNnAFZN+cwRuHe9qwJVrEtSr0jeFWWaxt0OvglAcv66ApHI6g137Y2cxqMyfJaBgFHI2d4Yl75ppkJuqkNch0YLhm2CiWllOnPfvdDkVz6ivW7T0jGbWtExeGt8NAMlQvkThE6Mo=
+  - secure: WO+grBRxUJcGIXhBouWFb6/M59JLcA/mgLOhQmQcLPyw4n32wKgyRQZfc9AYqH+9bWxh2uWIk+Z0wmugCM6ETq80cVpEHWWUZ66bhlPG0tHYcquvBfn/+1iOmnDRdtXpsg59qe/My69S9H1mwPYEznVLJXuCFhOxFy9L9LyWMQU=

README.md

@@ -8,7 +8,7 @@ EasyPost is the simple shipping API. You can sign up for an account at <https://
 Requirements
 ------------
 
-* [Python](https://www.python.org) 2.7 or 3.3+ (or corresponding [PyPy](https://pypy.org) versions).
+* [Python](https://www.python.org) 2.7 or 3.3+ (or corresponding [PyPy](https://pypy.org) versions). Note that we only test on Python 2.7 and 3.5+; we strongly recommend against using 3.3.x or 3.4.x as they are no longer supported by many libraries.
 * [requests](http://docs.python-requests.org/en/latest/) (if not on Google App Engine)
 * [six](https://pythonhosted.org/six/)
 
@@ -157,4 +157,5 @@ To run tests:
    - Create a virtualenv for your version of Python (e.g., `python2.7 -m virtualenv venv`)
    - Install dependencies in that virtualenv (`./venv/bin/pip install requests six`)
    - Install test dependencies (`./venv/bin/pip install -r requirements-tests.txt`)
+   - Export `$TEST_API_KEY` and `$PROD_API_KEY` appropriately (these are set by `.travis.yml` for CI)
    - Run the tests with `py.test` (`./venv/bin/py.test -vs tests`)

easypost/__init__.py

@@ -30,6 +30,8 @@
         import requests
         request_lib = 'requests'
         requests_session = requests.Session()
+        requests_http_adapter = requests.adapters.HTTPAdapter(max_retries=3)
+        requests_session.mount('https://api.easypost.com', requests_http_adapter)
     except ImportError:
         raise ImportError('EasyPost requires an up to date requests library. '
                           'Update requests via "pip install -U requests" or '
@@ -59,20 +61,21 @@
 
 
 class Error(Exception):
-    def __init__(self, message=None, http_status=None, http_body=None):
+    def __init__(self, message=None, http_status=None, http_body=None, original_exception=None):
         super(Error, self).__init__(message)
         self.message = message
         self.http_status = http_status
         self.http_body = http_body
+        self.original_exception = original_exception
         try:
             self.json_body = json.loads(http_body)
-        except:
+        except Exception:
             self.json_body = None
 
         self.param = None
         try:
             self.param = self.json_body['error'].get('param', None)
-        except:
+        except Exception:
             pass
 
 
@@ -222,7 +225,7 @@ def _encode_inner(cls, params):
                 # don't need special encoding
                 try:
                     value = six.text_type(value)
-                except:
+                except Exception:
                     pass
 
                 out.append((key, value))
@@ -350,7 +353,8 @@ def requests_request(self, method, abs_url, headers, params):
             http_status = result.status_code
         except Exception as e:
             raise Error("Unexpected error communicating with EasyPost. If this "
-                        "problem persists please let us know at [email protected].")
+                        "problem persists please let us know at [email protected].",
+                        original_exception=e)
         return http_body, http_status
 
     def urlfetch_request(self, method, abs_url, headers, params):
@@ -371,9 +375,10 @@ def urlfetch_request(self, method, abs_url, headers, params):
 
         try:
             result = urlfetch.fetch(**args)
-        except:
+        except Exception as e:
             raise Error("Unexpected error communicating with EasyPost. "
-                        "If this problem persists, let us know at [email protected].")
+                        "If this problem persists, let us know at [email protected].",
+                        original_exception=e)
 
         return result.content, result.status_code
 

requirements-tests.txt

@@ -1,3 +1,16 @@
 pytest==4.6.*
 pytest-cov==2.8.1
 pytz
+# 45.0.0 removes python 2.x support
+setuptools>=42,<45
+# zipp after 0.5 tries to install its own setuptools at build time,
+# which fails on python 2.7
+zipp==0.5.*
+# 4.x removes python 2.x support
+vcrpy==3.*
+# >3.0.5 removes python 2.x support
+mock==3.0.5
+pytest-vcr==1.*
+# 5.0.0 removes python 2.x support
+configparser<5
+requests

setup.py

@@ -44,11 +44,10 @@
         "Environment :: Web Environment",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: MIT License",

tests/cassettes/test_address_bytestring.yaml

@@ -0,0 +1,70 @@
+interactions:
+- request:
+    body: !!python/unicode address%5Bstate%5D=DELEGACI%C3%B3N+BENITO+JU%C3%A1REZ
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '53'
+      Content-type:
+      - application/x-www-form-urlencoded
+      authorization:
+      - EZTK-NONE
+      user-agent:
+      - easypost/v2 pythonclient/suppressed
+      x-client-user-agent:
+      - suppressed
+    method: POST
+    uri: https://api.easypost.com/v2/addresses
+  response:
+    body:
+      string: !!binary |
+        H4sIAAAAAAAAA4SQQU7DQAxFr1LNmkqZadNAdm2JUBEqErQbNpEz9gijZBJNJgioehjOwBF6MSaL
+        hsCG5f9+9rd9EIwiFYAuj5XRsIgBk4WcG5CXppjPrmaFLgqtI4PiQtTFC2kf+CWio7YNlnYEnjCH
+        3laRiqZRPJVyp2QaJ6lKngLTNfgvY6EikdquLMPMumrAvp9l6x2Rl7+lGmD2IzLkhIzr7C67Wa43
+        p6/tZJVtN7v7ye3+9PmQ9Ukf3PwEdda70C72j6HSPNd2WIIq4PIsqhr7uZ5a398MzjG53IDmchQf
+        XsJI1jMMjYaQHJS5h7e8//Rozz/eKzk2rMFzbVuRHo7HbwAAAP//AwDzj9QRnAEAAA==
+    headers:
+      cache-control:
+      - no-cache, no-store, must-revalidate, private
+      content-encoding:
+      - gzip
+      content-type:
+      - application/json; charset=utf-8
+      expires:
+      - '0'
+      location:
+      - /api/v2/addresses/adr_52fca65ad7614fa18fb4393bcbbcc0fd
+      pragma:
+      - no-cache
+      strict-transport-security:
+      - max-age=15768000; includeSubDomains; preload
+      transfer-encoding:
+      - chunked
+      x-backend:
+      - easypost
+      x-content-type-options:
+      - nosniff
+      x-ep-request-uuid:
+      - 2b85eb425eb9ca47fb0a061d000475f3
+      x-frame-options:
+      - SAMEORIGIN
+      x-node:
+      - bigweb6sj
+      x-proxied:
+      - intlb1sj 5834894b53
+      - extlb1sj 5834894b53
+      x-runtime:
+      - '0.034639'
+      x-version-label:
+      - easypost-202005112100-59b664a857-master
+      x-xss-protection:
+      - 1; mode=block
+    status:
+      code: 201
+      message: Created
+version: 1