Revision 16b037a9 lib/http/__init__.py
b/lib/http/__init__.py | ||
---|---|---|
32 | 32 |
from cStringIO import StringIO |
33 | 33 |
|
34 | 34 |
from ganeti import constants |
35 |
from ganeti import serializer |
|
36 | 35 |
from ganeti import utils |
37 | 36 |
|
38 | 37 |
|
... | ... | |
67 | 66 |
HTTP_ALLOW = "Allow" |
68 | 67 |
|
69 | 68 |
HTTP_APP_OCTET_STREAM = "application/octet-stream" |
69 |
HTTP_APP_JSON = "application/json" |
|
70 | 70 |
|
71 | 71 |
_SSL_UNEXPECTED_EOF = "Unexpected EOF" |
72 | 72 |
|
... | ... | |
323 | 323 |
code = 505 |
324 | 324 |
|
325 | 325 |
|
326 |
class HttpJsonConverter: # pylint: disable-msg=W0232 |
|
327 |
CONTENT_TYPE = "application/json" |
|
328 |
|
|
329 |
@staticmethod |
|
330 |
def Encode(data): |
|
331 |
return serializer.DumpJson(data) |
|
332 |
|
|
333 |
@staticmethod |
|
334 |
def Decode(data): |
|
335 |
return serializer.LoadJson(data) |
|
336 |
|
|
337 |
|
|
338 | 326 |
def WaitForSocketCondition(sock, event, timeout): |
339 | 327 |
"""Waits for a condition to occur on the socket. |
340 | 328 |
|
Also available in: Unified diff