Merge branch 'master' into true_verifications

Author: Justintime50

CHANGELOG.md

@@ -1,6 +1,9 @@
-### NEXT
+## CHANGELOG
+
+### NEXT RELEASE
 
 * Remove 2015-vintage experimental "`all_updated`" action from trackers
+* Correct references of `[email protected]` to `[email protected]`
 
 ### v5.1.2 2021-06-10
 

easypost/__init__.py

@@ -14,6 +14,7 @@
 __author__ = 'EasyPost <[email protected]>'
 __version__ = VERSION
 version_info = VERSION_INFO
+SUPPORT_EMAIL = '[email protected]'
 
 
 # use urlfetch as request_lib on google app engine, otherwise use requests
@@ -35,20 +36,20 @@
     except ImportError:
         raise ImportError('EasyPost requires an up to date requests library. '
                           'Update requests via "pip install -U requests" or '
-                          'contact us at [email protected].')
+                          'contact us at {}.'.format(SUPPORT_EMAIL))
 
     try:
         version = requests.__version__
         major, minor, patch = [int(i) for i in version.split('.')]
     except Exception:
         raise ImportError('EasyPost requires an up to date requests library. '
                           'Update requests via "pip install -U requests" or contact '
-                          'us at [email protected].')
+                          'us at {}.'.format(SUPPORT_EMAIL))
     else:
         if major < 1:
             raise ImportError('EasyPost requires an up to date requests library. Update '
                               'requests via "pip install -U requests" or contact us '
-                              'at [email protected].')
+                              'at {}.'.format(SUPPORT_EMAIL))
 
 # config
 api_key = None
@@ -286,7 +287,7 @@ def request_raw(self, method, url, params=None, apiKeyRequired=True):
             raise Error(
                 'No API key provided. Set an API key via "easypost.api_key = \'APIKEY\'. '
                 'Your API keys can be found in your EasyPost dashboard, or you can email us '
-                'at [email protected] for assistance.')
+                'at {} for assistance.'.format(SUPPORT_EMAIL))
 
         abs_url = self.api_url(url)
         params = self._objects_to_ids(params)
@@ -324,8 +325,8 @@ def request_raw(self, method, url, params=None, apiKeyRequired=True):
         elif request_lib == 'requests':
             http_body, http_status = self.requests_request(method, abs_url, headers, params)
         else:
-            raise Error("Bug discovered: invalid request_lib: %s. "
-                        "Please report to [email protected]." % request_lib)
+            raise Error("Bug discovered: invalid request_lib: {}. "
+                        "Please report to {}.".format(request_lib, SUPPORT_EMAIL))
 
         return http_body, http_status, my_api_key
 
@@ -347,8 +348,8 @@ def requests_request(self, method, abs_url, headers, params):
         elif method == 'post' or method == 'put':
             data = self.encode(params)
         else:
-            raise Error("Bug discovered: invalid request method: %s. "
-                        "Please report to [email protected]." % method)
+            raise Error("Bug discovered: invalid request method: {}. "
+                        "Please report to {}.".format(method, SUPPORT_EMAIL))
 
         try:
             result = requests_session.request(
@@ -363,7 +364,7 @@ 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 {}.".format(SUPPORT_EMAIL),
                         original_exception=e)
         return http_body, http_status
 
@@ -374,8 +375,8 @@ def urlfetch_request(self, method, abs_url, headers, params):
         elif method == 'get' or method == 'delete':
             abs_url = self.build_url(abs_url, params)
         else:
-            raise Error("Bug discovered: invalid request method: %s. Please report "
-                        "to [email protected]." % method)
+            raise Error("Bug discovered: invalid request method: {}. Please report "
+                        "to {}.".format(method, SUPPORT_EMAIL))
 
         args['url'] = abs_url
         args['method'] = method
@@ -387,7 +388,7 @@ def urlfetch_request(self, method, abs_url, headers, params):
             result = urlfetch.fetch(**args)
         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 {}.".format(SUPPORT_EMAIL),
                         original_exception=e)
 
         return result.content, result.status_code