Revision f3a722d4 kamaki/clients/__init__.py
b/kamaki/clients/__init__.py | ||
---|---|---|
70 | 70 |
def request(self, method, path, **kwargs): |
71 | 71 |
raw = kwargs.pop('raw', False) |
72 | 72 |
success = kwargs.pop('success', 200) |
73 |
directory = kwargs.pop('directory', False) |
|
73 | 74 |
|
74 | 75 |
data = kwargs.pop('data', None) |
75 | 76 |
headers = kwargs.pop('headers', {}) |
76 | 77 |
headers.setdefault('X-Auth-Token', self.token) |
77 | 78 |
|
78 |
if 'json' in kwargs: |
|
79 |
data = json.dumps(kwargs.pop('json')) |
|
80 |
headers.setdefault('Content-Type', 'application/json') |
|
81 |
|
|
82 |
if data: |
|
83 |
headers.setdefault('Content-Length', str(len(data))) |
|
79 |
if directory: |
|
80 |
headers.setdefault('Content-Type', 'application/directory') |
|
81 |
headers.setdefault('Content-length', '0') |
|
82 |
else: |
|
83 |
if 'json' in kwargs: |
|
84 |
data = json.dumps(kwargs.pop('json')) |
|
85 |
headers.setdefault('Content-Type', 'application/json') |
|
86 |
if data: |
|
87 |
headers.setdefault('Content-Length', str(len(data))) |
|
84 | 88 |
|
85 | 89 |
url = self.base_url + path |
86 | 90 |
kwargs.setdefault('verify', False) # Disable certificate verification |
Also available in: Unified diff