← Back to branch summary

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

« back to all changes in this revision

Viewing changes to grackle/model.py

  • Committer: William Grant
  • Date: 2012-01-22 10:39:15 UTC
  • Revision ID: william.grant@canonical.com-20120122103915-lqjw4jsaw3ug1q2g
Merge grackle.server into grackle. Alter Makefile to run all the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grackle/model.py
113
113
            'date': message.get('date'),
114
114
            'from': message.get('from'),
115
115
            'subject': message.get('subject'),
116
 
            'message-id': message.get('message-id'),
117
116
            }
118
117
 
119
118
    def get_messages(self, archive_uuid, order, count, start):
121
120
            reversed = order[0] == '-'
122
121
        else:
123
122
            raise AssertionError("Unsupported order.")
124
 
        if start:
125
 
            start = uuid.UUID(start)
126
123
        pairs = self.archive_messages.get(
127
124
            archive_uuid, column_count=count + 1,
128
125
            column_start=start, column_reversed=reversed).items()
129
126
        ids = [v for k, v in pairs]
130
127
        messages = self.messages.multiget(
131
 
            ids, columns=['date', 'from', 'subject', 'message-id'])
 
128
            ids, columns=['date', 'from', 'subject'])
132
129
        actual_count = len(pairs)
133
130
        if len(pairs) > count:
134
131
            assert len(pairs) == count + 1