← Back to branch summary

~unity-2d-team/unity-2d/Shell-MultiMonitor

« back to all changes in this revision

Viewing changes to grackle/client.py

  • Committer: Aaron Bentley
  • Date: 2012-01-13 13:52:09 UTC
  • mto: (6.1.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 45.
  • Revision ID: aaron@canonical.com-20120113135209-3s1l4hu25wjyq6jj
Fix grackle-put-message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grackle/client.py
19
19
        self.netloc = '%s:%d' % (host, port)
20
20
 
21
21
    def archive_url(self, archive_id, query):
22
 
        path = '/archive/%s' % quote(archive_id)
 
22
        path = '/%s' % quote(archive_id)
23
23
        query_string = urlencode(query)
24
24
        return urlunparse(('http', self.netloc, path, '', query_string, ''))
25
25
 
44
44
            raise Exception('!!')
45
45
 
46
46
    def get_messages(self, archive_id, message_ids=None, limit=None,
47
 
                     memo=None, order=None, headers=None,
48
 
                     max_body_length=None, include_hidden=False):
 
47
                     memo=None, order=None):
49
48
        parameters = {}
50
49
        if message_ids is not None:
51
50
            parameters['message_ids'] = message_ids
55
54
            parameters['memo'] = memo
56
55
        if order is not None:
57
56
            parameters['order'] = order
58
 
        if headers is not None:
59
 
            parameters['headers'] = headers
60
 
        if max_body_length is not None:
61
 
            parameters['max_body_length'] = max_body_length
62
 
        parameters['include_hidden'] = include_hidden
63
57
        query = {'parameters': simplejson.dumps(parameters)}
64
58
        response = self._verb_archive('GET', archive_id, query)
65
59
        if response.status == httplib.BAD_REQUEST:
66
60
            raise UnsupportedOrder
67
61
        data = response.read()
68
62
        return simplejson.loads(data)
69