Skip to content

Commit 782ff23

Browse files
author
Lelia
committed
corrections get_metadata
1 parent e587d35 commit 782ff23

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ ENV/
102102

103103
# idea
104104
.idea/
105+
106+
#pruebas
107+
pruebas.py

typeform/client.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ def __init__(self, api_key=None, access_token=None, version=None):
2222
else:
2323
raise exception.CredentialRequired("You must provide either access_token or api_key")
2424

25-
def _get(self, endpoint, data=None):
26-
return self._request('GET', endpoint, data=data)
25+
def _get(self, endpoint, data=None, params=None):
26+
return self._request('GET', endpoint, data=data, params=params)
2727

2828
def _put(self, endpoint, data=None):
2929
return self._request('PUT', endpoint, data=data)
3030

3131
def _delete(self, endpoint, data=None):
3232
return self._request('DELETE', endpoint, data=data)
3333

34-
def _request(self, method, endpoint, data=None):
34+
def _request(self, method, endpoint, data=None, params=None):
3535
url = '{0}/{1}'.format(self.base_url, endpoint)
36-
response = requests.request(method, url, auth=self.auth, data=json.dumps(data))
36+
if data:
37+
data = json.dumps(data)
38+
response = requests.request(method, url, auth=self.auth, data=data, params=params)
3739
return self._parse(response)
3840

3941
def _parse(self, response):
@@ -107,12 +109,10 @@ def get_form_questions(self, uid=None, url=None, form=None):
107109
return form['fields']
108110
return self.get_form_information(uid=uid, url=url)['fields']
109111

110-
def get_form_metadata(self, since, until, uid=None, url=None, form=None):
112+
def get_form_metadata(self, uid, since, until):
111113
"""Returns metadata of form (include answers).
112114
Args:
113115
uid: String, ID from the form
114-
url: String, Url from the form (the method needs the uid or form)
115-
form: String, A form
116116
since: String, The since parameter is a string that uses ISO 8601 format,
117117
Coordinated Universal Time (UTC), with "T" as a delimiter between the date and time.
118118
July 10, 2017 at 12:00 a.m. UTC is expressed as 2017-07-10T00:00:00.
@@ -126,13 +126,11 @@ def get_form_metadata(self, since, until, uid=None, url=None, form=None):
126126
Returns:
127127
A dict.
128128
"""
129-
if form is not None:
130-
return form['responses']
131129
data = {
132130
'since': since,
133131
'until': until,
134132
}
135-
return self._get(endpoint="forms/{0}/responses".format(uid), data=data).json()['items']
133+
return self._get(endpoint="forms/{0}/responses".format(uid), params=data).json()['items']
136134

137135

138136
def get_forms(self):

0 commit comments

Comments
 (0)