Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions airtable/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import requests
import six
import urllib

API_URL = 'https://api.airtable.com/v%s/'
API_VERSION = '0'
Expand Down Expand Up @@ -94,18 +95,29 @@ def __init__(self, base_id, api_key, dict_class=OrderedDict):
def __request(self, method, url, params=None, payload=None):
if method in ['POST', 'PUT', 'PATCH']:
self.headers.update({'Content-type': 'application/json'})

encoded_url = posixpath.join(self.base_url, urllib.parse.quote(url, safe=""))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't quote the whole url once you're here. Instead quote the table_name in the other functions

response = requests.request(
method,
posixpath.join(self.base_url, url),
params=params,
data=payload,
headers=self.headers)
method, encoded_url, params=params, data=payload, headers=self.headers
)

if response.status_code == requests.codes.ok:
return response.json(object_pairs_hook=self._dict_class)
error_json = response.json().get('error', {})
raise AirtableError(
error_type=error_json.get('type', str(response.status_code)),
message=error_json.get('message', json.dumps(response.json())))

error_json = response.json()
if isinstance(error_json, dict) and "error" in error_json:
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

if isinstance(error_json["error"], dict):
# Expected error format
error_type = error_json["error"].get("type", str(response.status_code))
message = error_json["error"].get("message", json.dumps(error_json))
else:
# Handle cases where error is a simple string like "NOT_FOUND"
error_type = str(response.status_code)
message = json.dumps(error_json)
else:
error_type = str(response.status_code)
message = "Unknown error format"
raise AirtableError(error_type=error_type, message=message)

def get( # pylint: disable=invalid-name
self, table_name, record_id=None, limit=0, offset=None,
Expand Down