Skip to content

[LIB-646] add geo point support to LIB; #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opalczynski merged 7 commits into from
Apr 26, 2016
Merged

[LIB-646] add geo point support to LIB; #187

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4ee89d
[LIB-646] add geo point support to LIB;
opalczynski Apr 14, 2016
e09ebaa
[LIB-646] simplify the make_request a little
opalczynski Apr 14, 2016
a2bd74a
[LIB-646] change the default param in get
opalczynski Apr 14, 2016
92af564
[LIB-646] correct check for batch requests
opalczynski Apr 14, 2016
a1acf37
[LIB-646] correct check for batch requests
opalczynski Apr 14, 2016
dac69d5
[LIB-646] small fixes in GeoPoint definition
opalczynski Apr 15, 2016
06a9049
[LIB-646][MERGE] merge with develop - resolve conflicts
opalczynski Apr 26, 2016
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
Prev Previous commit
Next Next commit
[LIB-646] simplify the make_request a little
  • Loading branch information
@opalczynski
opalczynski committed Apr 14, 2016
commit e09ebaa432df8b7cfd561ddeeb1939fab5620c83
14 changes: 9 additions & 5 deletions syncano/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,7 @@ def make_request(self, method_name, path, **kwargs):
data = kwargs.get('data', {})
files = data.pop('files', {})

if 'requests' in data: # batch requests
for request in data['requests']:
per_request_files = request['body'].pop('files', {})
if per_request_files:
raise SyncanoValueError('Batch do not support files upload.')
self._check_batch_files(data)

if files is None:
files = {k: v for k, v in six.iteritems(data) if hasattr(v, 'read')}
Expand Down Expand Up @@ -408,6 +404,14 @@ def get_user_info(self, api_key=None, user_key=None):
return self.make_request('GET', self.USER_INFO_SUFFIX.format(name=self.instance_name), headers={
'X-API-KEY': self.api_key, 'X-USER-KEY': self.user_key})

@classmethod
def _check_batch_files(cls, data):
if 'requests' in data: # batch requests
for request in data['requests']:
per_request_files = request['body'].pop('files', {})
if per_request_files:
raise SyncanoValueError('Batch do not support files upload.')


class ConnectionMixin(object):
"""Injects connection attribute with support of basic validation."""
Expand Down